gobject-introspection r399 - in trunk: . gir



Author: johan
Date: Mon Aug 18 20:43:48 2008
New Revision: 399
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=399&view=rev

Log:
2008-08-18  Johan Dahlin  <johan gnome org>

    * gir/gio-2.0-good.gir:
    * gir/glib-2.0-good.gir:
    * gir/gobject-2.0-good.gir:
    Regenerate.



Modified:
   trunk/ChangeLog
   trunk/gir/gio-2.0-good.gir
   trunk/gir/glib-2.0-good.gir
   trunk/gir/gobject-2.0-good.gir

Modified: trunk/gir/gio-2.0-good.gir
==============================================================================
--- trunk/gir/gio-2.0-good.gir	(original)
+++ trunk/gir/gio-2.0-good.gir	Mon Aug 18 20:43:48 2008
@@ -3,38 +3,37 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Gio">
-    <record name="Icon" c:type="GIcon"/>
-    <interface name="GIcon"
+    <interface name="Icon"
                c:type="GIcon"
                glib:type-name="GIcon"
                glib:get-type="g_icon_get_type">
-      <callback name="hash">
+      <callback name="hash" c:type="hash">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="icon">
-            <type name="GIcon" c:type="GIcon*"/>
+            <type name="Icon" c:type="GIcon*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="equal">
+      <callback name="equal" c:type="equal">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="icon1">
-            <type name="GIcon" c:type="GIcon*"/>
+            <type name="Icon" c:type="GIcon*"/>
           </parameter>
           <parameter name="icon2">
-            <type name="GIcon" c:type="GIcon*"/>
+            <type name="Icon" c:type="GIcon*"/>
           </parameter>
         </parameters>
       </callback>
     </interface>
     <function name="icon_hash" c:identifier="g_icon_hash">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="icon">
@@ -48,14 +47,14 @@
       </return-value>
       <parameters>
         <parameter name="icon1">
-          <type name="GIcon" c:type="GIcon*"/>
+          <type name="Icon" c:type="GIcon*"/>
         </parameter>
         <parameter name="icon2">
-          <type name="GIcon" c:type="GIcon*"/>
+          <type name="Icon" c:type="GIcon*"/>
         </parameter>
       </parameters>
     </function>
-    <bitfield name="GAppInfoCreateFlags"
+    <bitfield name="AppInfoCreateFlags"
               c:type="GAppInfoCreateFlags"
               glib:type-name="GAppInfoCreateFlags"
               glib:get-type="g_app_info_create_flags_get_type">
@@ -72,225 +71,362 @@
               c:identifier="G_APP_INFO_CREATE_SUPPORTS_URIS"
               glib:nick="supports-uris"/>
     </bitfield>
-    <record name="AppLaunchContext" c:type="GAppLaunchContext"/>
+    <class name="AppLaunchContext"
+           c:type="GAppLaunchContext"
+           parent="Object"
+           glib:type-name="GAppLaunchContext"
+           glib:get-type="g_app_launch_context_get_type">
+      <constructor name="new" c:identifier="g_app_launch_context_new">
+        <return-value>
+          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+        </return-value>
+      </constructor>
+      <method name="get_display"
+              c:identifier="g_app_launch_context_get_display">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="files">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_startup_notify_id"
+              c:identifier="g_app_launch_context_get_startup_notify_id">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="files">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="launch_failed"
+              c:identifier="g_app_launch_context_launch_failed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="startup_notify_id">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <field name="parent_instance">
+        <type name="Object" c:type="GObject"/>
+      </field>
+      <field name="priv">
+        <type name="AppLaunchContextPrivate"
+              c:type="GAppLaunchContextPrivate*"/>
+      </field>
+      <callback name="et_display" c:type="get_display">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="files">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_startup_notify_id" c:type="get_startup_notify_id">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="files">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="launch_failed" c:type="launch_failed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="startup_notify_id">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
     <record name="AppLaunchContextPrivate" c:type="GAppLaunchContextPrivate"/>
-    <record name="AppInfo" c:type="GAppInfo"/>
-    <interface name="GAppInfo"
+    <interface name="AppInfo"
                c:type="GAppInfo"
                glib:type-name="GAppInfo"
                glib:get-type="g_app_info_get_type">
-      <callback name="dup">
+      <callback name="dup" c:type="dup">
         <return-value>
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="equal">
+      <callback name="equal" c:type="equal">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo1">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
           <parameter name="appinfo2">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_id">
+      <callback name="et_id" c:type="get_id">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_name">
+      <callback name="et_name" c:type="get_name">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_description">
+      <callback name="et_description" c:type="get_description">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_executable">
+      <callback name="et_executable" c:type="get_executable">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_icon">
+      <callback name="et_icon" c:type="get_icon">
         <return-value>
-          <type name="GIcon" c:type="GIcon*"/>
+          <type name="Icon" c:type="GIcon*"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="launch">
+      <callback name="launch" c:type="launch">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
           <parameter name="filenames">
-            <type name="GLib.GList" c:type="GList*"/>
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
           <parameter name="launch_context">
-            <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="supports_uris">
+      <callback name="supports_uris" c:type="supports_uris">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="supports_files">
+      <callback name="supports_files" c:type="supports_files">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="launch_uris">
+      <callback name="launch_uris" c:type="launch_uris">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
           <parameter name="uris">
-            <type name="GLib.GList" c:type="GList*"/>
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
           <parameter name="launch_context">
-            <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="should_show">
+      <callback name="should_show" c:type="should_show">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_as_default_for_type">
+      <callback name="set_as_default_for_type"
+                c:type="set_as_default_for_type">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
           <parameter name="content_type">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_as_default_for_extension">
+      <callback name="set_as_default_for_extension"
+                c:type="set_as_default_for_extension">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
           <parameter name="extension">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_supports_type">
+      <callback name="add_supports_type" c:type="add_supports_type">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
           <parameter name="content_type">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_remove_supports_type">
+      <callback name="can_remove_supports_type"
+                c:type="can_remove_supports_type">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_supports_type">
+      <callback name="remove_supports_type" c:type="remove_supports_type">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="appinfo">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
+            <type name="AppInfo" c:type="GAppInfo*"/>
           </parameter>
           <parameter name="content_type">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -298,7 +434,7 @@
     <function name="app_info_create_from_commandline"
               c:identifier="g_app_info_create_from_commandline">
       <return-value>
-        <type name="GAppInfo" c:type="GAppInfo*"/>
+        <type name="AppInfo" c:type="GAppInfo*"/>
       </return-value>
       <parameters>
         <parameter name="commandline">
@@ -308,20 +444,20 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GAppInfoCreateFlags" c:type="GAppInfoCreateFlags"/>
+          <type name="AppInfoCreateFlags" c:type="GAppInfoCreateFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="app_info_dup" c:identifier="g_app_info_dup">
       <return-value>
-        <type name="GAppInfo" c:type="GAppInfo*"/>
+        <type name="AppInfo" c:type="GAppInfo*"/>
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -331,10 +467,10 @@
       </return-value>
       <parameters>
         <parameter name="appinfo1">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
         <parameter name="appinfo2">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -344,7 +480,7 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -354,7 +490,7 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -365,7 +501,7 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -376,17 +512,17 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
     <function name="app_info_get_icon" c:identifier="g_app_info_get_icon">
       <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
+        <type name="Icon" c:type="GIcon*"/>
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -396,16 +532,16 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
         <parameter name="files">
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </parameter>
         <parameter name="launch_context">
-          <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
+          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -416,7 +552,7 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -427,7 +563,7 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -438,16 +574,16 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
         <parameter name="uris">
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </parameter>
         <parameter name="launch_context">
-          <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
+          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -458,7 +594,7 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -469,13 +605,13 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
         <parameter name="content_type">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -486,13 +622,13 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
         <parameter name="extension">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -503,13 +639,13 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
         <parameter name="content_type">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -520,7 +656,7 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -531,25 +667,25 @@
       </return-value>
       <parameters>
         <parameter name="appinfo">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
         <parameter name="content_type">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="app_info_get_all" c:identifier="g_app_info_get_all">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
     </function>
     <function name="app_info_get_all_for_type"
               c:identifier="g_app_info_get_all_for_type">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="content_type">
@@ -560,7 +696,7 @@
     <function name="app_info_get_default_for_type"
               c:identifier="g_app_info_get_default_for_type">
       <return-value>
-        <type name="GAppInfo" c:type="GAppInfo*"/>
+        <type name="AppInfo" c:type="GAppInfo*"/>
       </return-value>
       <parameters>
         <parameter name="content_type">
@@ -574,7 +710,7 @@
     <function name="app_info_get_default_for_uri_scheme"
               c:identifier="g_app_info_get_default_for_uri_scheme">
       <return-value>
-        <type name="GAppInfo" c:type="GAppInfo*"/>
+        <type name="AppInfo" c:type="GAppInfo*"/>
       </return-value>
       <parameters>
         <parameter name="uri_scheme">
@@ -592,188 +728,54 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="launch_context">
-          <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
+          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GAppLaunchContext" c:type="_GAppLaunchContext">
-      <field name="parent_instance">
-        <type name="GObject.Object" c:type="GObject"/>
-      </field>
-      <field name="priv">
-        <type name="GAppLaunchContextPrivate"
-              c:type="GAppLaunchContextPrivate*"/>
-      </field>
-      <callback name="get_display">
-        <return-value>
-          <type name="string" c:type="char*"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
-          </parameter>
-          <parameter name="info">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
-          </parameter>
-          <parameter name="files">
-            <type name="GLib.GList" c:type="GList*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_startup_notify_id">
+    <interface name="AsyncResult"
+               c:type="GAsyncResult"
+               glib:type-name="GAsyncResult"
+               glib:get-type="g_async_result_get_type">
+      <callback name="et_user_data" c:type="get_user_data">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
-          </parameter>
-          <parameter name="info">
-            <type name="GAppInfo" c:type="GAppInfo*"/>
-          </parameter>
-          <parameter name="files">
-            <type name="GLib.GList" c:type="GList*"/>
+          <parameter name="async_result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="launch_failed">
+      <callback name="et_source_object" c:type="get_source_object">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Object" c:type="GObject*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
-          </parameter>
-          <parameter name="startup_notify_id">
-            <type name="string" c:type="char*"/>
+          <parameter name="async_result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_g_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_g_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_g_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_g_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_g_reserved5">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </record>
-    <function name="app_launch_context_new"
-              c:identifier="g_app_launch_context_new">
-      <return-value>
-        <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
-      </return-value>
-    </function>
-    <function name="app_launch_context_get_display"
-              c:identifier="g_app_launch_context_get_display">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
-        </parameter>
-        <parameter name="files">
-          <type name="GLib.GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_launch_context_get_startup_notify_id"
-              c:identifier="g_app_launch_context_get_startup_notify_id">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GAppInfo" c:type="GAppInfo*"/>
-        </parameter>
-        <parameter name="files">
-          <type name="GLib.GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_launch_context_launch_failed"
-              c:identifier="g_app_launch_context_launch_failed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="GAppLaunchContext" c:type="GAppLaunchContext*"/>
-        </parameter>
-        <parameter name="startup_notify_id">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AsyncResult" c:type="GAsyncResult"/>
-    <callback name="GAsyncReadyCallback">
+    </interface>
+    <callback name="AsyncReadyCallback" c:type="GAsyncReadyCallback">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="source_object">
-          <type name="GObject.Object" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <interface name="GAsyncResult"
-               c:type="GAsyncResult"
-               glib:type-name="GAsyncResult"
-               glib:get-type="g_async_result_get_type">
-      <callback name="get_user_data">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="async_result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_source_object">
-        <return-value>
-          <type name="GObject.Object" c:type="GObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="async_result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </interface>
     <function name="async_result_get_user_data"
               c:identifier="g_async_result_get_user_data">
       <return-value>
@@ -781,24 +783,24 @@
       </return-value>
       <parameters>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
       </parameters>
     </function>
     <function name="async_result_get_source_object"
               c:identifier="g_async_result_get_source_object">
       <return-value>
-        <type name="GObject.Object" c:type="GObject*"/>
+        <type name="Object" c:type="GObject*"/>
       </return-value>
       <parameters>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_error_quark" c:identifier="g_io_error_quark">
       <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <enumeration name="ErrorEnum"
@@ -936,1555 +938,2297 @@
       </return-value>
       <parameters>
         <parameter name="err_no">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="Cancellable" c:type="GCancellable"/>
-    <function name="cancellable_new" c:identifier="g_cancellable_new">
-      <return-value>
-        <type name="GCancellable" c:type="GCancellable*"/>
-      </return-value>
-    </function>
-    <function name="cancellable_is_cancelled"
-              c:identifier="g_cancellable_is_cancelled">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cancellable_set_error_if_cancelled"
+    <class name="Cancellable"
+           c:type="GCancellable"
+           parent="Object"
+           glib:type-name="GCancellable"
+           glib:get-type="g_cancellable_get_type">
+      <constructor name="new" c:identifier="g_cancellable_new">
+        <return-value>
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_current" c:identifier="g_cancellable_get_current">
+        <return-value>
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </return-value>
+      </constructor>
+      <method name="is_cancelled" c:identifier="g_cancellable_is_cancelled">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_error_if_cancelled"
               c:identifier="g_cancellable_set_error_if_cancelled">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cancellable_get_fd" c:identifier="g_cancellable_get_fd">
-      <return-value>
-        <type name="int32" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cancellable_get_current"
-              c:identifier="g_cancellable_get_current">
-      <return-value>
-        <type name="GCancellable" c:type="GCancellable*"/>
-      </return-value>
-    </function>
-    <function name="cancellable_push_current"
-              c:identifier="g_cancellable_push_current">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cancellable_pop_current"
-              c:identifier="g_cancellable_pop_current">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cancellable_reset" c:identifier="g_cancellable_reset">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cancellable_cancel" c:identifier="g_cancellable_cancel">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="InputStream" c:type="GInputStream"/>
-    <record name="InputStreamPrivate" c:type="GInputStreamPrivate"/>
-    <function name="input_stream_read" c:identifier="g_input_stream_read">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="count">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_read_all"
-              c:identifier="g_input_stream_read_all">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="count">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_skip" c:identifier="g_input_stream_skip">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="count">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_close" c:identifier="g_input_stream_close">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_read_async"
-              c:identifier="g_input_stream_read_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="count">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_read_finish"
-              c:identifier="g_input_stream_read_finish">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_skip_async"
-              c:identifier="g_input_stream_skip_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="count">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_skip_finish"
-              c:identifier="g_input_stream_skip_finish">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_close_async"
-              c:identifier="g_input_stream_close_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="io_priority">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_fd" c:identifier="g_cancellable_get_fd">
+        <return-value>
           <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_close_finish"
-              c:identifier="g_input_stream_close_finish">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_is_closed"
-              c:identifier="g_input_stream_is_closed">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_has_pending"
-              c:identifier="g_input_stream_has_pending">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_set_pending"
-              c:identifier="g_input_stream_set_pending">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_stream_clear_pending"
-              c:identifier="g_input_stream_clear_pending">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FilterInputStream" c:type="GFilterInputStream"/>
-    <record name="FilterInputStreamPrivate"
-            c:type="GFilterInputStreamPrivate"/>
-    <function name="filter_input_stream_get_base_stream"
-              c:identifier="g_filter_input_stream_get_base_stream">
-      <return-value>
-        <type name="GInputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFilterInputStream" c:type="GFilterInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="BufferedInputStream" c:type="GBufferedInputStream"/>
-    <record name="BufferedInputStreamPrivate"
-            c:type="GBufferedInputStreamPrivate"/>
-    <function name="buffered_input_stream_new"
-              c:identifier="g_buffered_input_stream_new">
-      <return-value>
-        <type name="GInputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_new_sized"
-              c:identifier="g_buffered_input_stream_new_sized">
-      <return-value>
-        <type name="GInputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_get_buffer_size"
-              c:identifier="g_buffered_input_stream_get_buffer_size">
-      <return-value>
-        <type name="size" c:type="gsize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_set_buffer_size"
-              c:identifier="g_buffered_input_stream_set_buffer_size">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_get_available"
-              c:identifier="g_buffered_input_stream_get_available">
-      <return-value>
-        <type name="size" c:type="gsize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_peek"
-              c:identifier="g_buffered_input_stream_peek">
-      <return-value>
-        <type name="size" c:type="gsize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="count">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_peek_buffer"
-              c:identifier="g_buffered_input_stream_peek_buffer">
-      <return-value>
-        <type name="any" c:type="void*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-        <parameter name="count">
-          <type name="gsize" c:type="gsize*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_fill"
-              c:identifier="g_buffered_input_stream_fill">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-        <parameter name="count">
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="push_current" c:identifier="g_cancellable_push_current">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="pop_current" c:identifier="g_cancellable_pop_current">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="reset" c:identifier="g_cancellable_reset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="cancel" c:identifier="g_cancellable_cancel">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="cancelled" c:type="cancelled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="cancelled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <class name="InputStream"
+           c:type="GInputStream"
+           parent="Object"
+           glib:type-name="GInputStream"
+           glib:get-type="g_input_stream_get_type">
+      <method name="read" c:identifier="g_input_stream_read">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_all" c:identifier="g_input_stream_read_all">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="bytes_read">
+            <type name="size" c:type="gsize*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="skip" c:identifier="g_input_stream_skip">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close" c:identifier="g_input_stream_close">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_async" c:identifier="g_input_stream_read_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_finish" c:identifier="g_input_stream_read_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="skip_async" c:identifier="g_input_stream_skip_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="skip_finish" c:identifier="g_input_stream_skip_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close_async" c:identifier="g_input_stream_close_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close_finish" c:identifier="g_input_stream_close_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_closed" c:identifier="g_input_stream_is_closed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="has_pending" c:identifier="g_input_stream_has_pending">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pending" c:identifier="g_input_stream_set_pending">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="clear_pending" c:identifier="g_input_stream_clear_pending">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="read_fn" c:type="read_fn">
+        <return-value>
           <type name="ssize" c:type="gssize"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_fill_async"
-              c:identifier="g_buffered_input_stream_fill_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-        <parameter name="count">
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="skip" c:type="skip">
+        <return-value>
           <type name="ssize" c:type="gssize"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_fill_finish"
-              c:identifier="g_buffered_input_stream_fill_finish">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_input_stream_read_byte"
-              c:identifier="g_buffered_input_stream_read_byte">
-      <return-value>
-        <type name="int32" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedInputStream" c:type="GBufferedInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <bitfield name="GOutputStreamSpliceFlags"
-              c:type="GOutputStreamSpliceFlags"
-              glib:type-name="GOutputStreamSpliceFlags"
-              glib:get-type="g_output_stream_splice_flags_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="G_OUTPUT_STREAM_SPLICE_NONE"
-              glib:nick="none"/>
-      <member name="close-source"
-              value="1"
-              c:identifier="G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE"
-              glib:nick="close-source"/>
-      <member name="close-target"
-              value="2"
-              c:identifier="G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET"
-              glib:nick="close-target"/>
-    </bitfield>
-    <record name="OutputStream" c:type="GOutputStream"/>
-    <record name="OutputStreamPrivate" c:type="GOutputStreamPrivate"/>
-    <function name="output_stream_write" c:identifier="g_output_stream_write">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="count">
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_fn" c:type="close_fn">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="read_async" c:type="read_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="read_finish" c:type="read_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="skip_async" c:type="skip_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="skip_finish" c:type="skip_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_async" c:type="close_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_finish" c:type="close_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="InputStreamPrivate" c:type="GInputStreamPrivate"/>
+    <class name="FilterInputStream"
+           c:type="GFilterInputStream"
+           parent="InputStream"
+           glib:type-name="GFilterInputStream"
+           glib:get-type="g_filter_input_stream_get_type">
+      <method name="get_base_stream"
+              c:identifier="g_filter_input_stream_get_base_stream">
+        <return-value>
+          <type name="InputStream" c:type="GInputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FilterInputStream" c:type="GFilterInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="base-stream">
+        <type name="InputStream" c:type="GInputStream"/>
+      </property>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="FilterInputStreamPrivate"
+            c:type="GFilterInputStreamPrivate"/>
+    <class name="BufferedInputStream"
+           c:type="GBufferedInputStream"
+           parent="FilterInputStream"
+           glib:type-name="GBufferedInputStream"
+           glib:get-type="g_buffered_input_stream_get_type">
+      <method name="get_buffer_size"
+              c:identifier="g_buffered_input_stream_get_buffer_size">
+        <return-value>
           <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_write_all"
-              c:identifier="g_output_stream_write_all">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="count">
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_buffer_size"
+              c:identifier="g_buffered_input_stream_set_buffer_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_available"
+              c:identifier="g_buffered_input_stream_get_available">
+        <return-value>
           <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_splice"
-              c:identifier="g_output_stream_splice">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="source">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GOutputStreamSpliceFlags"
-                c:type="GOutputStreamSpliceFlags"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_flush" c:identifier="g_output_stream_flush">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_close" c:identifier="g_output_stream_close">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_write_async"
-              c:identifier="g_output_stream_write_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="count">
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="peek" c:identifier="g_buffered_input_stream_peek">
+        <return-value>
           <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_write_finish"
-              c:identifier="g_output_stream_write_finish">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_splice_async"
-              c:identifier="g_output_stream_splice_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="source">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GOutputStreamSpliceFlags"
-                c:type="GOutputStreamSpliceFlags"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_splice_finish"
-              c:identifier="g_output_stream_splice_finish">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_flush_async"
-              c:identifier="g_output_stream_flush_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_flush_finish"
-              c:identifier="g_output_stream_flush_finish">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_close_async"
-              c:identifier="g_output_stream_close_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_close_finish"
-              c:identifier="g_output_stream_close_finish">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_is_closed"
-              c:identifier="g_output_stream_is_closed">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="output_stream_has_pending"
-              c:identifier="g_output_stream_has_pending">
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="peek_buffer"
+              c:identifier="g_buffered_input_stream_peek_buffer">
+        <return-value>
+          <type name="any" c:type="void*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="fill" c:identifier="g_buffered_input_stream_fill">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="ssize" c:type="gssize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="fill_async"
+              c:identifier="g_buffered_input_stream_fill_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="ssize" c:type="gssize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="fill_finish"
+              c:identifier="g_buffered_input_stream_fill_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_byte"
+              c:identifier="g_buffered_input_stream_read_byte">
+        <return-value>
+          <type name="int32" c:type="int"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="buffer-size">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <callback name="fill" c:type="fill">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="ssize" c:type="gssize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="fill_async" c:type="fill_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="ssize" c:type="gssize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="fill_finish" c:type="fill_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="BufferedInputStreamPrivate"
+            c:type="GBufferedInputStreamPrivate"/>
+    <function name="buffered_input_stream_new"
+              c:identifier="g_buffered_input_stream_new">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="InputStream" c:type="GInputStream*"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
+        <parameter name="base_stream">
+          <type name="InputStream" c:type="GInputStream*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="output_stream_set_pending"
-              c:identifier="g_output_stream_set_pending">
+    <function name="buffered_input_stream_new_sized"
+              c:identifier="g_buffered_input_stream_new_sized">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="InputStream" c:type="GInputStream*"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
+        <parameter name="base_stream">
+          <type name="InputStream" c:type="GInputStream*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="size">
+          <type name="size" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
-    <function name="output_stream_clear_pending"
+    <bitfield name="OutputStreamSpliceFlags"
+              c:type="GOutputStreamSpliceFlags"
+              glib:type-name="GOutputStreamSpliceFlags"
+              glib:get-type="g_output_stream_splice_flags_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="G_OUTPUT_STREAM_SPLICE_NONE"
+              glib:nick="none"/>
+      <member name="close-source"
+              value="1"
+              c:identifier="G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE"
+              glib:nick="close-source"/>
+      <member name="close-target"
+              value="2"
+              c:identifier="G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET"
+              glib:nick="close-target"/>
+    </bitfield>
+    <class name="OutputStream"
+           c:type="GOutputStream"
+           parent="Object"
+           glib:type-name="GOutputStream"
+           glib:get-type="g_output_stream_get_type">
+      <method name="write" c:identifier="g_output_stream_write">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="write_all" c:identifier="g_output_stream_write_all">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="bytes_written">
+            <type name="size" c:type="gsize*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="splice" c:identifier="g_output_stream_splice">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="source">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="OutputStreamSpliceFlags"
+                  c:type="GOutputStreamSpliceFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="flush" c:identifier="g_output_stream_flush">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close" c:identifier="g_output_stream_close">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="write_async" c:identifier="g_output_stream_write_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="write_finish" c:identifier="g_output_stream_write_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="splice_async" c:identifier="g_output_stream_splice_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="source">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="OutputStreamSpliceFlags"
+                  c:type="GOutputStreamSpliceFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="splice_finish"
+              c:identifier="g_output_stream_splice_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="flush_async" c:identifier="g_output_stream_flush_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="flush_finish" c:identifier="g_output_stream_flush_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close_async" c:identifier="g_output_stream_close_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close_finish" c:identifier="g_output_stream_close_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_closed" c:identifier="g_output_stream_is_closed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="has_pending" c:identifier="g_output_stream_has_pending">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pending" c:identifier="g_output_stream_set_pending">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="clear_pending"
               c:identifier="g_output_stream_clear_pending">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FilterOutputStream" c:type="GFilterOutputStream"/>
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="write_fn" c:type="write_fn">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="splice" c:type="splice">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="source">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="OutputStreamSpliceFlags"
+                  c:type="GOutputStreamSpliceFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="flush" c:type="flush">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_fn" c:type="close_fn">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="write_async" c:type="write_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="write_finish" c:type="write_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="splice_async" c:type="splice_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="source">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="OutputStreamSpliceFlags"
+                  c:type="GOutputStreamSpliceFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="splice_finish" c:type="splice_finish">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="flush_async" c:type="flush_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="flush_finish" c:type="flush_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_async" c:type="close_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_finish" c:type="close_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved6" c:type="_g_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved7" c:type="_g_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved8" c:type="_g_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="OutputStreamPrivate" c:type="GOutputStreamPrivate"/>
+    <class name="FilterOutputStream"
+           c:type="GFilterOutputStream"
+           parent="OutputStream"
+           glib:type-name="GFilterOutputStream"
+           glib:get-type="g_filter_output_stream_get_type">
+      <method name="get_base_stream"
+              c:identifier="g_filter_output_stream_get_base_stream">
+        <return-value>
+          <type name="OutputStream" c:type="GOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FilterOutputStream" c:type="GFilterOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="base-stream">
+        <type name="OutputStream" c:type="GOutputStream"/>
+      </property>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
     <record name="FilterOutputStreamPrivate"
             c:type="GFilterOutputStreamPrivate"/>
-    <function name="filter_output_stream_get_base_stream"
-              c:identifier="g_filter_output_stream_get_base_stream">
-      <return-value>
-        <type name="GOutputStream" c:type="GOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFilterOutputStream" c:type="GFilterOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="BufferedOutputStream" c:type="GBufferedOutputStream"/>
-    <record name="BufferedOutputStreamPrivate"
-            c:type="GBufferedOutputStreamPrivate"/>
-    <function name="buffered_output_stream_new"
-              c:identifier="g_buffered_output_stream_new">
-      <return-value>
-        <type name="GOutputStream" c:type="GOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_output_stream_new_sized"
-              c:identifier="g_buffered_output_stream_new_sized">
-      <return-value>
-        <type name="GOutputStream" c:type="GOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_output_stream_get_buffer_size"
+    <class name="BufferedOutputStream"
+           c:type="GBufferedOutputStream"
+           parent="FilterOutputStream"
+           glib:type-name="GBufferedOutputStream"
+           glib:get-type="g_buffered_output_stream_get_type">
+      <method name="get_buffer_size"
               c:identifier="g_buffered_output_stream_get_buffer_size">
-      <return-value>
-        <type name="size" c:type="gsize"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedOutputStream" c:type="GBufferedOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_output_stream_set_buffer_size"
-              c:identifier="g_buffered_output_stream_set_buffer_size">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedOutputStream" c:type="GBufferedOutputStream*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_output_stream_get_auto_grow"
-              c:identifier="g_buffered_output_stream_get_auto_grow">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedOutputStream" c:type="GBufferedOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buffered_output_stream_set_auto_grow"
-              c:identifier="g_buffered_output_stream_set_auto_grow">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GBufferedOutputStream" c:type="GBufferedOutputStream*"/>
-        </parameter>
-        <parameter name="auto_grow">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_equals" c:identifier="g_content_type_equals">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="type1">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="type2">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_is_a" c:identifier="g_content_type_is_a">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="supertype">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_is_unknown"
-              c:identifier="g_content_type_is_unknown">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_get_description"
-              c:identifier="g_content_type_get_description">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_get_mime_type"
-              c:identifier="g_content_type_get_mime_type">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_get_icon"
-              c:identifier="g_content_type_get_icon">
-      <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_can_be_executable"
-              c:identifier="g_content_type_can_be_executable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_type_guess" c:identifier="g_content_type_guess">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="filename">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="GLib.guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="data_size">
+        <return-value>
           <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="result_uncertain">
-          <type name="GLib.gboolean" c:type="gboolean*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_types_get_registered"
-              c:identifier="g_content_types_get_registered">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-    </function>
-    <record name="DataInputStream" c:type="GDataInputStream"/>
-    <record name="DataInputStreamPrivate" c:type="GDataInputStreamPrivate"/>
-    <enumeration name="GDataStreamByteOrder"
-                 c:type="GDataStreamByteOrder"
-                 glib:type-name="GDataStreamByteOrder"
-                 glib:get-type="g_data_stream_byte_order_get_type">
-      <member name="big-endian"
-              value="0"
-              c:identifier="G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN"
-              glib:nick="big-endian"/>
-      <member name="little-endian"
-              value="1"
-              c:identifier="G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN"
-              glib:nick="little-endian"/>
-      <member name="host-endian"
-              value="2"
-              c:identifier="G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN"
-              glib:nick="host-endian"/>
-    </enumeration>
-    <enumeration name="GDataStreamNewlineType"
-                 c:type="GDataStreamNewlineType"
-                 glib:type-name="GDataStreamNewlineType"
-                 glib:get-type="g_data_stream_newline_type_get_type">
-      <member name="lf"
-              value="0"
-              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_LF"
-              glib:nick="lf"/>
-      <member name="cr"
-              value="1"
-              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_CR"
-              glib:nick="cr"/>
-      <member name="cr-lf"
-              value="2"
-              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_CR_LF"
-              glib:nick="cr-lf"/>
-      <member name="any"
-              value="3"
-              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_ANY"
-              glib:nick="any"/>
-    </enumeration>
-    <function name="data_input_stream_new"
-              c:identifier="g_data_input_stream_new">
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_buffer_size"
+              c:identifier="g_buffered_output_stream_set_buffer_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_auto_grow"
+              c:identifier="g_buffered_output_stream_get_auto_grow">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_auto_grow"
+              c:identifier="g_buffered_output_stream_set_auto_grow">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+          </parameter>
+          <parameter name="auto_grow">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="buffer-size">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="auto-grow">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="BufferedOutputStreamPrivate"
+            c:type="GBufferedOutputStreamPrivate"/>
+    <function name="buffered_output_stream_new"
+              c:identifier="g_buffered_output_stream_new">
       <return-value>
-        <type name="GDataInputStream" c:type="GDataInputStream*"/>
+        <type name="OutputStream" c:type="GOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="base_stream">
-          <type name="GInputStream" c:type="GInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_set_byte_order"
-              c:identifier="g_data_input_stream_set_byte_order">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="order">
-          <type name="GDataStreamByteOrder" c:type="GDataStreamByteOrder"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_get_byte_order"
-              c:identifier="g_data_input_stream_get_byte_order">
-      <return-value>
-        <type name="GDataStreamByteOrder" c:type="GDataStreamByteOrder"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_set_newline_type"
-              c:identifier="g_data_input_stream_set_newline_type">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GDataStreamNewlineType" c:type="GDataStreamNewlineType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_get_newline_type"
-              c:identifier="g_data_input_stream_get_newline_type">
-      <return-value>
-        <type name="GDataStreamNewlineType" c:type="GDataStreamNewlineType"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_byte"
-              c:identifier="g_data_input_stream_read_byte">
-      <return-value>
-        <type name="GLib.guchar" c:type="guchar"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_int16"
-              c:identifier="g_data_input_stream_read_int16">
-      <return-value>
-        <type name="int16" c:type="gint16"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_uint16"
-              c:identifier="g_data_input_stream_read_uint16">
-      <return-value>
-        <type name="uint16" c:type="guint16"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_int32"
-              c:identifier="g_data_input_stream_read_int32">
-      <return-value>
-        <type name="int32" c:type="gint32"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="OutputStream" c:type="GOutputStream*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_input_stream_read_uint32"
-              c:identifier="g_data_input_stream_read_uint32">
-      <return-value>
-        <type name="uint32" c:type="guint32"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_int64"
-              c:identifier="g_data_input_stream_read_int64">
-      <return-value>
-        <type name="gint64" c:type="gint64"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_uint64"
-              c:identifier="g_data_input_stream_read_uint64">
-      <return-value>
-        <type name="guint64" c:type="guint64"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_line"
-              c:identifier="g_data_input_stream_read_line">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_input_stream_read_until"
-              c:identifier="g_data_input_stream_read_until">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataInputStream" c:type="GDataInputStream*"/>
-        </parameter>
-        <parameter name="stop_chars">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="DataOutputStream" c:type="GDataOutputStream"/>
-    <record name="DataOutputStreamPrivate" c:type="GDataOutputStreamPrivate"/>
-    <function name="data_output_stream_new"
-              c:identifier="g_data_output_stream_new">
+    <function name="buffered_output_stream_new_sized"
+              c:identifier="g_buffered_output_stream_new_sized">
       <return-value>
-        <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
+        <type name="OutputStream" c:type="GOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="base_stream">
-          <type name="GOutputStream" c:type="GOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="data_output_stream_set_byte_order"
-              c:identifier="g_data_output_stream_set_byte_order">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
+          <type name="OutputStream" c:type="GOutputStream*"/>
         </parameter>
-        <parameter name="order">
-          <type name="GDataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+        <parameter name="size">
+          <type name="size" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_get_byte_order"
-              c:identifier="g_data_output_stream_get_byte_order">
+    <function name="content_type_equals" c:identifier="g_content_type_equals">
       <return-value>
-        <type name="GDataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
+        <parameter name="type1">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="type2">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_byte"
-              c:identifier="g_data_output_stream_put_byte">
+    <function name="content_type_is_a" c:identifier="g_content_type_is_a">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="GLib.guchar" c:type="guchar"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+        <parameter name="type">
+          <type name="string" c:type="char*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="supertype">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_int16"
-              c:identifier="g_data_output_stream_put_int16">
+    <function name="content_type_is_unknown"
+              c:identifier="g_content_type_is_unknown">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="int16" c:type="gint16"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="type">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_uint16"
-              c:identifier="g_data_output_stream_put_uint16">
+    <function name="content_type_get_description"
+              c:identifier="g_content_type_get_description">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="uint16" c:type="guint16"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="type">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_int32"
-              c:identifier="g_data_output_stream_put_int32">
+    <function name="content_type_get_mime_type"
+              c:identifier="g_content_type_get_mime_type">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="int32" c:type="gint32"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="type">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_uint32"
-              c:identifier="g_data_output_stream_put_uint32">
+    <function name="content_type_get_icon"
+              c:identifier="g_content_type_get_icon">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="Icon" c:type="GIcon*"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="type">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_int64"
-              c:identifier="g_data_output_stream_put_int64">
+    <function name="content_type_can_be_executable"
+              c:identifier="g_content_type_can_be_executable">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gint64" c:type="gint64"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="type">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_uint64"
-              c:identifier="g_data_output_stream_put_uint64">
+    <function name="content_type_guess" c:identifier="g_content_type_guess">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
+        <parameter name="filename">
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="data">
-          <type name="guint64" c:type="guint64"/>
+          <type name="uchar" c:type="guchar*"/>
         </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+        <parameter name="data_size">
+          <type name="size" c:type="gsize"/>
         </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="result_uncertain">
+          <type name="boolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="data_output_stream_put_string"
-              c:identifier="g_data_output_stream_put_string">
+    <function name="content_types_get_registered"
+              c:identifier="g_content_types_get_registered">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GDataOutputStream" c:type="GDataOutputStream*"/>
-        </parameter>
-        <parameter name="str">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
     </function>
-    <enumeration name="GFileAttributeType"
+    <class name="DataInputStream"
+           c:type="GDataInputStream"
+           parent="BufferedInputStream"
+           glib:type-name="GDataInputStream"
+           glib:get-type="g_data_input_stream_get_type">
+      <constructor name="new" c:identifier="g_data_input_stream_new">
+        <return-value>
+          <type name="DataInputStream" c:type="GDataInputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="base_stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_byte_order"
+              c:identifier="g_data_input_stream_set_byte_order">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="order">
+            <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_byte_order"
+              c:identifier="g_data_input_stream_get_byte_order">
+        <return-value>
+          <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_newline_type"
+              c:identifier="g_data_input_stream_set_newline_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="DataStreamNewlineType"
+                  c:type="GDataStreamNewlineType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_newline_type"
+              c:identifier="g_data_input_stream_get_newline_type">
+        <return-value>
+          <type name="DataStreamNewlineType" c:type="GDataStreamNewlineType"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_byte" c:identifier="g_data_input_stream_read_byte">
+        <return-value>
+          <type name="uchar" c:type="guchar"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_int16" c:identifier="g_data_input_stream_read_int16">
+        <return-value>
+          <type name="int16" c:type="gint16"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_uint16"
+              c:identifier="g_data_input_stream_read_uint16">
+        <return-value>
+          <type name="uint16" c:type="guint16"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_int32" c:identifier="g_data_input_stream_read_int32">
+        <return-value>
+          <type name="int32" c:type="gint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_uint32"
+              c:identifier="g_data_input_stream_read_uint32">
+        <return-value>
+          <type name="uint32" c:type="guint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_int64" c:identifier="g_data_input_stream_read_int64">
+        <return-value>
+          <type name="int64" c:type="gint64"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_uint64"
+              c:identifier="g_data_input_stream_read_uint64">
+        <return-value>
+          <type name="uint64" c:type="guint64"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_line" c:identifier="g_data_input_stream_read_line">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="size" c:type="gsize*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="read_until" c:identifier="g_data_input_stream_read_until">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
+          </parameter>
+          <parameter name="stop_chars">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="size" c:type="gsize*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="byte-order">
+        <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+      </property>
+      <property name="newline-type">
+        <type name="DataStreamNewlineType" c:type="GDataStreamNewlineType"/>
+      </property>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="DataInputStreamPrivate" c:type="GDataInputStreamPrivate"/>
+    <enumeration name="DataStreamByteOrder"
+                 c:type="GDataStreamByteOrder"
+                 glib:type-name="GDataStreamByteOrder"
+                 glib:get-type="g_data_stream_byte_order_get_type">
+      <member name="big-endian"
+              value="0"
+              c:identifier="G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN"
+              glib:nick="big-endian"/>
+      <member name="little-endian"
+              value="1"
+              c:identifier="G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN"
+              glib:nick="little-endian"/>
+      <member name="host-endian"
+              value="2"
+              c:identifier="G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN"
+              glib:nick="host-endian"/>
+    </enumeration>
+    <enumeration name="DataStreamNewlineType"
+                 c:type="GDataStreamNewlineType"
+                 glib:type-name="GDataStreamNewlineType"
+                 glib:get-type="g_data_stream_newline_type_get_type">
+      <member name="lf"
+              value="0"
+              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_LF"
+              glib:nick="lf"/>
+      <member name="cr"
+              value="1"
+              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_CR"
+              glib:nick="cr"/>
+      <member name="cr-lf"
+              value="2"
+              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_CR_LF"
+              glib:nick="cr-lf"/>
+      <member name="any"
+              value="3"
+              c:identifier="G_DATA_STREAM_NEWLINE_TYPE_ANY"
+              glib:nick="any"/>
+    </enumeration>
+    <class name="DataOutputStream"
+           c:type="GDataOutputStream"
+           parent="FilterOutputStream"
+           glib:type-name="GDataOutputStream"
+           glib:get-type="g_data_output_stream_get_type">
+      <constructor name="new" c:identifier="g_data_output_stream_new">
+        <return-value>
+          <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="base_stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_byte_order"
+              c:identifier="g_data_output_stream_set_byte_order">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="order">
+            <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_byte_order"
+              c:identifier="g_data_output_stream_get_byte_order">
+        <return-value>
+          <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_byte" c:identifier="g_data_output_stream_put_byte">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="uchar" c:type="guchar"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_int16" c:identifier="g_data_output_stream_put_int16">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="int16" c:type="gint16"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_uint16" c:identifier="g_data_output_stream_put_uint16">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="uint16" c:type="guint16"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_int32" c:identifier="g_data_output_stream_put_int32">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="int32" c:type="gint32"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_uint32" c:identifier="g_data_output_stream_put_uint32">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_int64" c:identifier="g_data_output_stream_put_int64">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="int64" c:type="gint64"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_uint64" c:identifier="g_data_output_stream_put_uint64">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="uint64" c:type="guint64"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_string" c:identifier="g_data_output_stream_put_string">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="byte-order">
+        <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+      </property>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="DataOutputStreamPrivate" c:type="GDataOutputStreamPrivate"/>
+    <enumeration name="FileAttributeType"
                  c:type="GFileAttributeType"
                  glib:type-name="GFileAttributeType"
                  glib:get-type="g_file_attribute_type_get_type">
@@ -2525,934 +3269,920 @@
               c:identifier="G_FILE_ATTRIBUTE_TYPE_OBJECT"
               glib:nick="object"/>
     </enumeration>
-    <bitfield name="GFileAttributeInfoFlags"
+    <bitfield name="FileAttributeInfoFlags"
               c:type="GFileAttributeInfoFlags"
               glib:type-name="GFileAttributeInfoFlags"
               glib:get-type="g_file_attribute_info_flags_get_type">
       <member name="none"
               value="0"
               c:identifier="G_FILE_ATTRIBUTE_INFO_NONE"
-              glib:nick="none"/>
-      <member name="copy-with-file"
-              value="1"
-              c:identifier="G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE"
-              glib:nick="copy-with-file"/>
-      <member name="copy-when-moved"
-              value="2"
-              c:identifier="G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED"
-              glib:nick="copy-when-moved"/>
-    </bitfield>
-    <enumeration name="GFileAttributeStatus"
-                 c:type="GFileAttributeStatus"
-                 glib:type-name="GFileAttributeStatus"
-                 glib:get-type="g_file_attribute_status_get_type">
-      <member name="unset"
-              value="0"
-              c:identifier="G_FILE_ATTRIBUTE_STATUS_UNSET"
-              glib:nick="unset"/>
-      <member name="set"
-              value="1"
-              c:identifier="G_FILE_ATTRIBUTE_STATUS_SET"
-              glib:nick="set"/>
-      <member name="error-setting"
-              value="2"
-              c:identifier="G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING"
-              glib:nick="error-setting"/>
-    </enumeration>
-    <record name="FileAttributeInfo" c:type="GFileAttributeInfo"/>
-    <record name="FileAttributeInfoList" c:type="GFileAttributeInfoList"/>
-    <function name="file_attribute_info_list_new"
-              c:identifier="g_file_attribute_info_list_new">
-      <return-value>
-        <type name="GFileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
-      </return-value>
-    </function>
-    <function name="file_attribute_info_list_ref"
-              c:identifier="g_file_attribute_info_list_ref">
-      <return-value>
-        <type name="GFileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GFileAttributeInfoList"
-                c:type="GFileAttributeInfoList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_info_list_unref"
-              c:identifier="g_file_attribute_info_list_unref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GFileAttributeInfoList"
-                c:type="GFileAttributeInfoList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_info_list_dup"
-              c:identifier="g_file_attribute_info_list_dup">
-      <return-value>
-        <type name="GFileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GFileAttributeInfoList"
-                c:type="GFileAttributeInfoList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_info_list_lookup"
-              c:identifier="g_file_attribute_info_list_lookup">
-      <return-value>
-        <type name="GFileAttributeInfo" c:type="GFileAttributeInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GFileAttributeInfoList"
-                c:type="GFileAttributeInfoList*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_info_list_add"
-              c:identifier="g_file_attribute_info_list_add">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GFileAttributeInfoList"
-                c:type="GFileAttributeInfoList*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GFileAttributeType" c:type="GFileAttributeType"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GFileAttributeInfoFlags"
-                c:type="GFileAttributeInfoFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FileInfo" c:type="GFileInfo"/>
-    <record name="FileAttributeMatcher" c:type="GFileAttributeMatcher"/>
-    <enumeration name="GFileType"
-                 c:type="GFileType"
-                 glib:type-name="GFileType"
-                 glib:get-type="g_file_type_get_type">
-      <member name="unknown"
-              value="0"
-              c:identifier="G_FILE_TYPE_UNKNOWN"
-              glib:nick="unknown"/>
-      <member name="regular"
-              value="1"
-              c:identifier="G_FILE_TYPE_REGULAR"
-              glib:nick="regular"/>
-      <member name="directory"
-              value="2"
-              c:identifier="G_FILE_TYPE_DIRECTORY"
-              glib:nick="directory"/>
-      <member name="symbolic-link"
-              value="3"
-              c:identifier="G_FILE_TYPE_SYMBOLIC_LINK"
-              glib:nick="symbolic-link"/>
-      <member name="special"
-              value="4"
-              c:identifier="G_FILE_TYPE_SPECIAL"
-              glib:nick="special"/>
-      <member name="shortcut"
-              value="5"
-              c:identifier="G_FILE_TYPE_SHORTCUT"
-              glib:nick="shortcut"/>
-      <member name="mountable"
-              value="6"
-              c:identifier="G_FILE_TYPE_MOUNTABLE"
-              glib:nick="mountable"/>
-    </enumeration>
-    <enumeration name="GFilesystemPreviewType"
-                 c:type="GFilesystemPreviewType"
-                 glib:type-name="GFilesystemPreviewType"
-                 glib:get-type="g_filesystem_preview_type_get_type">
-      <member name="if-always"
+              glib:nick="none"/>
+      <member name="copy-with-file"
+              value="1"
+              c:identifier="G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE"
+              glib:nick="copy-with-file"/>
+      <member name="copy-when-moved"
+              value="2"
+              c:identifier="G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED"
+              glib:nick="copy-when-moved"/>
+    </bitfield>
+    <enumeration name="FileAttributeStatus"
+                 c:type="GFileAttributeStatus"
+                 glib:type-name="GFileAttributeStatus"
+                 glib:get-type="g_file_attribute_status_get_type">
+      <member name="unset"
               value="0"
-              c:identifier="G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS"
-              glib:nick="if-always"/>
-      <member name="if-local"
+              c:identifier="G_FILE_ATTRIBUTE_STATUS_UNSET"
+              glib:nick="unset"/>
+      <member name="set"
               value="1"
-              c:identifier="G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL"
-              glib:nick="if-local"/>
-      <member name="never"
+              c:identifier="G_FILE_ATTRIBUTE_STATUS_SET"
+              glib:nick="set"/>
+      <member name="error-setting"
               value="2"
-              c:identifier="G_FILESYSTEM_PREVIEW_TYPE_NEVER"
-              glib:nick="never"/>
+              c:identifier="G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING"
+              glib:nick="error-setting"/>
     </enumeration>
-    <function name="file_info_new" c:identifier="g_file_info_new">
+    <record name="FileAttributeInfo" c:type="GFileAttributeInfo"/>
+    <record name="FileAttributeInfoList" c:type="GFileAttributeInfoList"/>
+    <function name="file_attribute_info_list_new"
+              c:identifier="g_file_attribute_info_list_new">
       <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
+        <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
       </return-value>
     </function>
-    <function name="file_info_dup" c:identifier="g_file_info_dup">
+    <function name="file_attribute_info_list_ref"
+              c:identifier="g_file_attribute_info_list_ref">
       <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
+        <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
       </return-value>
       <parameters>
-        <parameter name="other">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_info_copy_into" c:identifier="g_file_info_copy_into">
+    <function name="file_attribute_info_list_unref"
+              c:identifier="g_file_attribute_info_list_unref">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="src_info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="dest_info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_info_has_attribute"
-              c:identifier="g_file_info_has_attribute">
+    <function name="file_attribute_info_list_dup"
+              c:identifier="g_file_attribute_info_list_dup">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
       </return-value>
       <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_info_list_attributes"
-              c:identifier="g_file_info_list_attributes">
+    <function name="file_attribute_info_list_lookup"
+              c:identifier="g_file_attribute_info_list_lookup">
       <return-value>
-        <type name="char" c:type="char**"/>
+        <type name="FileAttributeInfo" c:type="GFileAttributeInfo*"/>
       </return-value>
       <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </parameter>
-        <parameter name="name_space">
+        <parameter name="name">
           <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_info_get_attribute_data"
-              c:identifier="g_file_info_get_attribute_data">
+    <function name="file_attribute_info_list_add"
+              c:identifier="g_file_attribute_info_list_add">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </parameter>
-        <parameter name="attribute">
+        <parameter name="name">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="type">
-          <type name="GFileAttributeType" c:type="GFileAttributeType*"/>
-        </parameter>
-        <parameter name="value_pp">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="FileAttributeType" c:type="GFileAttributeType"/>
         </parameter>
-        <parameter name="status">
-          <type name="GFileAttributeStatus" c:type="GFileAttributeStatus*"/>
+        <parameter name="flags">
+          <type name="FileAttributeInfoFlags"
+                c:type="GFileAttributeInfoFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_info_get_attribute_type"
+    <class name="FileInfo"
+           c:type="GFileInfo"
+           parent="Object"
+           glib:type-name="GFileInfo"
+           glib:get-type="g_file_info_get_type">
+      <constructor name="new" c:identifier="g_file_info_new">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+      </constructor>
+      <constructor name="dup" c:identifier="g_file_info_dup">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="other">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="copy_into" c:identifier="g_file_info_copy_into">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="src_info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="dest_info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="has_attribute" c:identifier="g_file_info_has_attribute">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="list_attributes"
+              c:identifier="g_file_info_list_attributes">
+        <return-value>
+          <type name="char" c:type="char**"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="name_space">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_data"
+              c:identifier="g_file_info_get_attribute_data">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="FileAttributeType" c:type="GFileAttributeType*"/>
+          </parameter>
+          <parameter name="value_pp">
+            <type name="pointer" c:type="gpointer*"/>
+          </parameter>
+          <parameter name="status">
+            <type name="FileAttributeStatus" c:type="GFileAttributeStatus*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_type"
               c:identifier="g_file_info_get_attribute_type">
-      <return-value>
-        <type name="GFileAttributeType" c:type="GFileAttributeType"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_remove_attribute"
+        <return-value>
+          <type name="FileAttributeType" c:type="GFileAttributeType"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_attribute"
               c:identifier="g_file_info_remove_attribute">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_status"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_status"
               c:identifier="g_file_info_get_attribute_status">
-      <return-value>
-        <type name="GFileAttributeStatus" c:type="GFileAttributeStatus"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_as_string"
+        <return-value>
+          <type name="FileAttributeStatus" c:type="GFileAttributeStatus"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_as_string"
               c:identifier="g_file_info_get_attribute_as_string">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_string"
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_string"
               c:identifier="g_file_info_get_attribute_string">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_byte_string"
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_byte_string"
               c:identifier="g_file_info_get_attribute_byte_string">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_boolean"
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_boolean"
               c:identifier="g_file_info_get_attribute_boolean">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_uint32"
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_uint32"
               c:identifier="g_file_info_get_attribute_uint32">
-      <return-value>
-        <type name="uint32" c:type="guint32"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_int32"
+        <return-value>
+          <type name="uint32" c:type="guint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_int32"
               c:identifier="g_file_info_get_attribute_int32">
-      <return-value>
-        <type name="int32" c:type="gint32"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_uint64"
+        <return-value>
+          <type name="int32" c:type="gint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_uint64"
               c:identifier="g_file_info_get_attribute_uint64">
-      <return-value>
-        <type name="guint64" c:type="guint64"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_int64"
+        <return-value>
+          <type name="uint64" c:type="guint64"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_int64"
               c:identifier="g_file_info_get_attribute_int64">
-      <return-value>
-        <type name="gint64" c:type="gint64"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_attribute_object"
+        <return-value>
+          <type name="int64" c:type="gint64"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attribute_object"
               c:identifier="g_file_info_get_attribute_object">
-      <return-value>
-        <type name="GObject.Object" c:type="GObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute"
-              c:identifier="g_file_info_set_attribute">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GFileAttributeType" c:type="GFileAttributeType"/>
-        </parameter>
-        <parameter name="value_p">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_string"
+        <return-value>
+          <type name="Object" c:type="GObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute" c:identifier="g_file_info_set_attribute">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="FileAttributeType" c:type="GFileAttributeType"/>
+          </parameter>
+          <parameter name="value_p">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_string"
               c:identifier="g_file_info_set_attribute_string">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_byte_string"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_byte_string"
               c:identifier="g_file_info_set_attribute_byte_string">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_boolean"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_boolean"
               c:identifier="g_file_info_set_attribute_boolean">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_uint32"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_uint32"
               c:identifier="g_file_info_set_attribute_uint32">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_int32"
-              c:identifier="g_file_info_set_attribute_int32">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="int32" c:type="gint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_uint64"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_int32"
+              c:identifier="g_file_info_set_attribute_int32">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="int32" c:type="gint32"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_uint64"
               c:identifier="g_file_info_set_attribute_uint64">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="guint64" c:type="guint64"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_int64"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="uint64" c:type="guint64"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_int64"
               c:identifier="g_file_info_set_attribute_int64">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="gint64" c:type="gint64"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_object"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="int64" c:type="gint64"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_object"
               c:identifier="g_file_info_set_attribute_object">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="attr_value">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_clear_status"
-              c:identifier="g_file_info_clear_status">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_file_type"
-              c:identifier="g_file_info_get_file_type">
-      <return-value>
-        <type name="GFileType" c:type="GFileType"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_is_hidden"
-              c:identifier="g_file_info_get_is_hidden">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_is_backup"
-              c:identifier="g_file_info_get_is_backup">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_is_symlink"
-              c:identifier="g_file_info_get_is_symlink">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_name" c:identifier="g_file_info_get_name">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_display_name"
-              c:identifier="g_file_info_get_display_name">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_edit_name"
-              c:identifier="g_file_info_get_edit_name">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_icon" c:identifier="g_file_info_get_icon">
-      <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_content_type"
-              c:identifier="g_file_info_get_content_type">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_size" c:identifier="g_file_info_get_size">
-      <return-value>
-        <type name="goffset" c:type="goffset"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_modification_time"
-              c:identifier="g_file_info_get_modification_time">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GLib.GTimeVal" c:type="GTimeVal*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_symlink_target"
-              c:identifier="g_file_info_get_symlink_target">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_etag" c:identifier="g_file_info_get_etag">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_get_sort_order"
-              c:identifier="g_file_info_get_sort_order">
-      <return-value>
-        <type name="int32" c:type="gint32"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_attribute_mask"
-              c:identifier="g_file_info_set_attribute_mask">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_unset_attribute_mask"
-              c:identifier="g_file_info_unset_attribute_mask">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_file_type"
-              c:identifier="g_file_info_set_file_type">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GFileType" c:type="GFileType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_is_hidden"
-              c:identifier="g_file_info_set_is_hidden">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="is_hidden">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="attr_value">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="clear_status" c:identifier="g_file_info_clear_status">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_file_type" c:identifier="g_file_info_get_file_type">
+        <return-value>
+          <type name="FileType" c:type="GFileType"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_is_hidden" c:identifier="g_file_info_get_is_hidden">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_is_symlink"
-              c:identifier="g_file_info_set_is_symlink">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="is_symlink">
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_is_backup" c:identifier="g_file_info_get_is_backup">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_name" c:identifier="g_file_info_set_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="name">
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_is_symlink" c:identifier="g_file_info_get_is_symlink">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_name" c:identifier="g_file_info_get_name">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_display_name"
-              c:identifier="g_file_info_set_display_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="display_name">
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_display_name"
+              c:identifier="g_file_info_get_display_name">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_edit_name"
-              c:identifier="g_file_info_set_edit_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="edit_name">
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_edit_name" c:identifier="g_file_info_get_edit_name">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_icon" c:identifier="g_file_info_set_icon">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="icon">
-          <type name="GIcon" c:type="GIcon*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_content_type"
-              c:identifier="g_file_info_set_content_type">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="content_type">
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_icon" c:identifier="g_file_info_get_icon">
+        <return-value>
+          <type name="Icon" c:type="GIcon*"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_content_type"
+              c:identifier="g_file_info_get_content_type">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_size" c:identifier="g_file_info_set_size">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="goffset" c:type="goffset"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_modification_time"
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_size" c:identifier="g_file_info_get_size">
+        <return-value>
+          <type name="offset" c:type="goffset"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_modification_time"
+              c:identifier="g_file_info_get_modification_time">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="GLib.TimeVal" c:type="GTimeVal*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_symlink_target"
+              c:identifier="g_file_info_get_symlink_target">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_etag" c:identifier="g_file_info_get_etag">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_sort_order" c:identifier="g_file_info_get_sort_order">
+        <return-value>
+          <type name="int32" c:type="gint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attribute_mask"
+              c:identifier="g_file_info_set_attribute_mask">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unset_attribute_mask"
+              c:identifier="g_file_info_unset_attribute_mask">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_file_type" c:identifier="g_file_info_set_file_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="FileType" c:type="GFileType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_is_hidden" c:identifier="g_file_info_set_is_hidden">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="is_hidden">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_is_symlink" c:identifier="g_file_info_set_is_symlink">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="is_symlink">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_name" c:identifier="g_file_info_set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_display_name"
+              c:identifier="g_file_info_set_display_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="display_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_edit_name" c:identifier="g_file_info_set_edit_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="edit_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_icon" c:identifier="g_file_info_set_icon">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Icon" c:type="GIcon*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_content_type"
+              c:identifier="g_file_info_set_content_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="content_type">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_size" c:identifier="g_file_info_set_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="offset" c:type="goffset"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_modification_time"
               c:identifier="g_file_info_set_modification_time">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="mtime">
-          <type name="GLib.GTimeVal" c:type="GTimeVal*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_symlink_target"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="mtime">
+            <type name="GLib.TimeVal" c:type="GTimeVal*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_symlink_target"
               c:identifier="g_file_info_set_symlink_target">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="symlink_target">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_info_set_sort_order"
-              c:identifier="g_file_info_set_sort_order">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
-        </parameter>
-        <parameter name="sort_order">
-          <type name="int32" c:type="gint32"/>
-        </parameter>
-      </parameters>
-    </function>
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="symlink_target">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_sort_order" c:identifier="g_file_info_set_sort_order">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="sort_order">
+            <type name="int32" c:type="gint32"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <record name="FileAttributeMatcher" c:type="GFileAttributeMatcher"/>
+    <enumeration name="FileType"
+                 c:type="GFileType"
+                 glib:type-name="GFileType"
+                 glib:get-type="g_file_type_get_type">
+      <member name="unknown"
+              value="0"
+              c:identifier="G_FILE_TYPE_UNKNOWN"
+              glib:nick="unknown"/>
+      <member name="regular"
+              value="1"
+              c:identifier="G_FILE_TYPE_REGULAR"
+              glib:nick="regular"/>
+      <member name="directory"
+              value="2"
+              c:identifier="G_FILE_TYPE_DIRECTORY"
+              glib:nick="directory"/>
+      <member name="symbolic-link"
+              value="3"
+              c:identifier="G_FILE_TYPE_SYMBOLIC_LINK"
+              glib:nick="symbolic-link"/>
+      <member name="special"
+              value="4"
+              c:identifier="G_FILE_TYPE_SPECIAL"
+              glib:nick="special"/>
+      <member name="shortcut"
+              value="5"
+              c:identifier="G_FILE_TYPE_SHORTCUT"
+              glib:nick="shortcut"/>
+      <member name="mountable"
+              value="6"
+              c:identifier="G_FILE_TYPE_MOUNTABLE"
+              glib:nick="mountable"/>
+    </enumeration>
+    <enumeration name="FilesystemPreviewType"
+                 c:type="GFilesystemPreviewType"
+                 glib:type-name="GFilesystemPreviewType"
+                 glib:get-type="g_filesystem_preview_type_get_type">
+      <member name="if-always"
+              value="0"
+              c:identifier="G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS"
+              glib:nick="if-always"/>
+      <member name="if-local"
+              value="1"
+              c:identifier="G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL"
+              glib:nick="if-local"/>
+      <member name="never"
+              value="2"
+              c:identifier="G_FILESYSTEM_PREVIEW_TYPE_NEVER"
+              glib:nick="never"/>
+    </enumeration>
     <function name="file_attribute_matcher_new"
               c:identifier="g_file_attribute_matcher_new">
       <return-value>
-        <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
+        <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
       </return-value>
       <parameters>
         <parameter name="attributes">
@@ -3460,380 +4190,1165 @@
         </parameter>
       </parameters>
     </function>
-    <function name="file_attribute_matcher_ref"
-              c:identifier="g_file_attribute_matcher_ref">
-      <return-value>
-        <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-      </return-value>
-      <parameters>
-        <parameter name="matcher">
-          <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_matcher_unref"
-              c:identifier="g_file_attribute_matcher_unref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="matcher">
-          <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_matcher_matches"
-              c:identifier="g_file_attribute_matcher_matches">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="matcher">
-          <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_matcher_matches_only"
-              c:identifier="g_file_attribute_matcher_matches_only">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="matcher">
-          <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-        </parameter>
-        <parameter name="attribute">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_matcher_enumerate_namespace"
-              c:identifier="g_file_attribute_matcher_enumerate_namespace">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="matcher">
-          <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-        </parameter>
-        <parameter name="ns">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_attribute_matcher_enumerate_next"
-              c:identifier="g_file_attribute_matcher_enumerate_next">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="matcher">
-          <type name="GFileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FileEnumerator" c:type="GFileEnumerator"/>
-    <record name="FileEnumeratorPrivate" c:type="GFileEnumeratorPrivate"/>
-    <function name="file_enumerator_next_file"
-              c:identifier="g_file_enumerator_next_file">
-      <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_enumerator_close"
-              c:identifier="g_file_enumerator_close">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_enumerator_next_files_async"
-              c:identifier="g_file_enumerator_next_files_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
-        </parameter>
-        <parameter name="num_files">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_enumerator_next_files_finish"
-              c:identifier="g_file_enumerator_next_files_finish">
+    <function name="file_attribute_matcher_ref"
+              c:identifier="g_file_attribute_matcher_ref">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
       </return-value>
       <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="matcher">
+          <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_enumerator_close_async"
-              c:identifier="g_file_enumerator_close_async">
+    <function name="file_attribute_matcher_unref"
+              c:identifier="g_file_attribute_matcher_unref">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="matcher">
+          <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_enumerator_close_finish"
-              c:identifier="g_file_enumerator_close_finish">
+    <function name="file_attribute_matcher_matches"
+              c:identifier="g_file_attribute_matcher_matches">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+        <parameter name="matcher">
+          <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="attribute">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_enumerator_is_closed"
-              c:identifier="g_file_enumerator_is_closed">
+    <function name="file_attribute_matcher_matches_only"
+              c:identifier="g_file_attribute_matcher_matches_only">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
+        <parameter name="matcher">
+          <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
+        </parameter>
+        <parameter name="attribute">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_enumerator_has_pending"
-              c:identifier="g_file_enumerator_has_pending">
+    <function name="file_attribute_matcher_enumerate_namespace"
+              c:identifier="g_file_attribute_matcher_enumerate_namespace">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
+        <parameter name="matcher">
+          <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
+        </parameter>
+        <parameter name="ns">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_enumerator_set_pending"
-              c:identifier="g_file_enumerator_set_pending">
+    <function name="file_attribute_matcher_enumerate_next"
+              c:identifier="g_file_attribute_matcher_enumerate_next">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
-        <parameter name="enumerator">
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
+        <parameter name="matcher">
+          <type name="FileAttributeMatcher" c:type="GFileAttributeMatcher*"/>
         </parameter>
-        <parameter name="pending">
+      </parameters>
+    </function>
+    <class name="FileEnumerator"
+           c:type="GFileEnumerator"
+           parent="Object"
+           glib:type-name="GFileEnumerator"
+           glib:get-type="g_file_enumerator_get_type">
+      <method name="next_file" c:identifier="g_file_enumerator_next_file">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close" c:identifier="g_file_enumerator_close">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="next_files_async"
+              c:identifier="g_file_enumerator_next_files_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="num_files">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="next_files_finish"
+              c:identifier="g_file_enumerator_next_files_finish">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close_async" c:identifier="g_file_enumerator_close_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close_finish"
+              c:identifier="g_file_enumerator_close_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_closed" c:identifier="g_file_enumerator_is_closed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="has_pending" c:identifier="g_file_enumerator_has_pending">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pending" c:identifier="g_file_enumerator_set_pending">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="pending">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="next_file" c:type="next_file">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_fn" c:type="close_fn">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="next_files_async" c:type="next_files_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="num_files">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="next_files_finish" c:type="next_files_finish">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_async" c:type="close_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close_finish" c:type="close_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          </parameter>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved6" c:type="_g_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved7" c:type="_g_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="FileEnumeratorPrivate" c:type="GFileEnumeratorPrivate"/>
+    <class name="FileInputStream"
+           c:type="GFileInputStream"
+           parent="InputStream"
+           glib:type-name="GFileInputStream"
+           glib:get-type="g_file_input_stream_get_type">
+      <method name="query_info" c:identifier="g_file_input_stream_query_info">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="query_info_async"
+              c:identifier="g_file_input_stream_query_info_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="query_info_finish"
+              c:identifier="g_file_input_stream_query_info_finish">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="tell" c:type="tell">
+        <return-value>
+          <type name="offset" c:type="goffset"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_seek" c:type="can_seek">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FileInputStream" c:type="GFileInputStream"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="seek" c:type="seek">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="offset" c:type="goffset"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GLib.SeekType" c:type="GSeekType"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="query_info" c:type="query_info">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="query_info_async" c:type="query_info_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="query_info_finish" c:type="query_info_finish">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          </parameter>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
     <record name="FileInputStreamPrivate" c:type="GFileInputStreamPrivate"/>
-    <function name="file_input_stream_query_info"
-              c:identifier="g_file_input_stream_query_info">
-      <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFileInputStream" c:type="GFileInputStream*"/>
-        </parameter>
-        <parameter name="attributes">
+    <class name="FileOutputStream"
+           c:type="GFileOutputStream"
+           parent="OutputStream"
+           glib:type-name="GFileOutputStream"
+           glib:get-type="g_file_output_stream_get_type">
+      <method name="query_info" c:identifier="g_file_output_stream_query_info">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="query_info_async"
+              c:identifier="g_file_output_stream_query_info_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="query_info_finish"
+              c:identifier="g_file_output_stream_query_info_finish">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_etag" c:identifier="g_file_output_stream_get_etag">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_input_stream_query_info_async"
-              c:identifier="g_file_input_stream_query_info_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFileInputStream" c:type="GFileInputStream*"/>
-        </parameter>
-        <parameter name="attributes">
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="tell" c:type="tell">
+        <return-value>
+          <type name="offset" c:type="goffset"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_seek" c:type="can_seek">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="seek" c:type="seek">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="offset" c:type="goffset"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GLib.SeekType" c:type="GSeekType"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_truncate" c:type="can_truncate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="truncate_fn" c:type="truncate_fn">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="offset" c:type="goffset"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="query_info" c:type="query_info">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="query_info_async" c:type="query_info_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="query_info_finish" c:type="query_info_finish">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_etag" c:type="get_etag">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_input_stream_query_info_finish"
-              c:identifier="g_file_input_stream_query_info_finish">
-      <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFileInputStream" c:type="GFileInputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FileOutputStream" c:type="GFileOutputStream"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
     <record name="FileOutputStreamPrivate" c:type="GFileOutputStreamPrivate"/>
-    <function name="file_output_stream_query_info"
-              c:identifier="g_file_output_stream_query_info">
-      <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
-        </parameter>
-        <parameter name="attributes">
+    <class name="MountOperation"
+           c:type="GMountOperation"
+           parent="Object"
+           glib:type-name="GMountOperation"
+           glib:get-type="g_mount_operation_get_type">
+      <constructor name="new" c:identifier="g_mount_operation_new">
+        <return-value>
+          <type name="MountOperation" c:type="GMountOperation*"/>
+        </return-value>
+      </constructor>
+      <method name="get_username"
+              c:identifier="g_mount_operation_get_username">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_output_stream_query_info_async"
-              c:identifier="g_file_output_stream_query_info_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
-        </parameter>
-        <parameter name="attributes">
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_username"
+              c:identifier="g_mount_operation_set_username">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="username">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_password"
+              c:identifier="g_mount_operation_get_password">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="io_priority">
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_password"
+              c:identifier="g_mount_operation_set_password">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="password">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_anonymous"
+              c:identifier="g_mount_operation_get_anonymous">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_anonymous"
+              c:identifier="g_mount_operation_set_anonymous">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="anonymous">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_domain" c:identifier="g_mount_operation_get_domain">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_domain" c:identifier="g_mount_operation_set_domain">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="domain">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_password_save"
+              c:identifier="g_mount_operation_get_password_save">
+        <return-value>
+          <type name="PasswordSave" c:type="GPasswordSave"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_password_save"
+              c:identifier="g_mount_operation_set_password_save">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="save">
+            <type name="PasswordSave" c:type="GPasswordSave"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_choice" c:identifier="g_mount_operation_get_choice">
+        <return-value>
           <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_output_stream_query_info_finish"
-              c:identifier="g_file_output_stream_query_info_finish">
-      <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_output_stream_get_etag"
-              c:identifier="g_file_output_stream_get_etag">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stream">
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="MountOperation" c:type="GMountOperation"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_choice" c:identifier="g_mount_operation_set_choice">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="choice">
+            <type name="int32" c:type="int"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="reply" c:identifier="g_mount_operation_reply">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="MountOperationResult" c:type="GMountOperationResult"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="username">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="password">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="anonymous">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="domain">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="password-save">
+        <type name="PasswordSave" c:type="GPasswordSave"/>
+      </property>
+      <property name="choice">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="ask_password" c:type="ask_password">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="message">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="default_user">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="default_domain">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="AskPasswordFlags" c:type="GAskPasswordFlags"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="ask_question" c:type="ask_question">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="message">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="choices">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="reply" c:type="reply">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="MountOperationResult" c:type="GMountOperationResult"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved6" c:type="_g_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved7" c:type="_g_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved8" c:type="_g_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved9" c:type="_g_reserved9">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved10" c:type="_g_reserved10">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved11" c:type="_g_reserved11">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved12" c:type="_g_reserved12">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="ask-password">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="AskPasswordFlags" c:type="GAskPasswordFlags"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="ask-question">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="Strv" c:type="GStrv"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="reply">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="MountOperationResult" c:type="GMountOperationResult"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
     <record name="MountOperationPrivate" c:type="GMountOperationPrivate"/>
-    <bitfield name="GAskPasswordFlags"
+    <bitfield name="AskPasswordFlags"
               c:type="GAskPasswordFlags"
               glib:type-name="GAskPasswordFlags"
               glib:get-type="g_ask_password_flags_get_type">
@@ -3858,7 +5373,7 @@
               c:identifier="G_ASK_PASSWORD_ANONYMOUS_SUPPORTED"
               glib:nick="anonymous-supported"/>
     </bitfield>
-    <enumeration name="GPasswordSave"
+    <enumeration name="PasswordSave"
                  c:type="GPasswordSave"
                  glib:type-name="GPasswordSave"
                  glib:get-type="g_password_save_get_type">
@@ -3875,7 +5390,7 @@
               c:identifier="G_PASSWORD_SAVE_PERMANENTLY"
               glib:nick="permanently"/>
     </enumeration>
-    <enumeration name="GMountOperationResult"
+    <enumeration name="MountOperationResult"
                  c:type="GMountOperationResult"
                  glib:type-name="GMountOperationResult"
                  glib:get-type="g_mount_operation_result_get_type">
@@ -3892,176 +5407,7 @@
               c:identifier="G_MOUNT_OPERATION_UNHANDLED"
               glib:nick="unhandled"/>
     </enumeration>
-    <function name="mount_operation_new" c:identifier="g_mount_operation_new">
-      <return-value>
-        <type name="GMountOperation" c:type="GMountOperation*"/>
-      </return-value>
-    </function>
-    <function name="mount_operation_get_username"
-              c:identifier="g_mount_operation_get_username">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_username"
-              c:identifier="g_mount_operation_set_username">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-        <parameter name="username">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_get_password"
-              c:identifier="g_mount_operation_get_password">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_password"
-              c:identifier="g_mount_operation_set_password">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-        <parameter name="password">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_get_anonymous"
-              c:identifier="g_mount_operation_get_anonymous">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_anonymous"
-              c:identifier="g_mount_operation_set_anonymous">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-        <parameter name="anonymous">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_get_domain"
-              c:identifier="g_mount_operation_get_domain">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_domain"
-              c:identifier="g_mount_operation_set_domain">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-        <parameter name="domain">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_get_password_save"
-              c:identifier="g_mount_operation_get_password_save">
-      <return-value>
-        <type name="GPasswordSave" c:type="GPasswordSave"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_password_save"
-              c:identifier="g_mount_operation_set_password_save">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-        <parameter name="save">
-          <type name="GPasswordSave" c:type="GPasswordSave"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_get_choice"
-              c:identifier="g_mount_operation_get_choice">
-      <return-value>
-        <type name="int32" c:type="int"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_choice"
-              c:identifier="g_mount_operation_set_choice">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-        <parameter name="choice">
-          <type name="int32" c:type="int"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_reply"
-              c:identifier="g_mount_operation_reply">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GMountOperationResult" c:type="GMountOperationResult"/>
-        </parameter>
-      </parameters>
-    </function>
-    <bitfield name="GFileQueryInfoFlags"
+    <bitfield name="FileQueryInfoFlags"
               c:type="GFileQueryInfoFlags"
               glib:type-name="GFileQueryInfoFlags"
               glib:get-type="g_file_query_info_flags_get_type">
@@ -4074,7 +5420,7 @@
               c:identifier="G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS"
               glib:nick="nofollow-symlinks"/>
     </bitfield>
-    <bitfield name="GFileCreateFlags"
+    <bitfield name="FileCreateFlags"
               c:type="GFileCreateFlags"
               glib:type-name="GFileCreateFlags"
               glib:get-type="g_file_create_flags_get_type">
@@ -4087,7 +5433,7 @@
               c:identifier="G_FILE_CREATE_PRIVATE"
               glib:nick="private"/>
     </bitfield>
-    <enumeration name="GMountMountFlags"
+    <enumeration name="MountMountFlags"
                  c:type="GMountMountFlags"
                  glib:type-name="GMountMountFlags"
                  glib:get-type="g_mount_mount_flags_get_type">
@@ -4096,7 +5442,7 @@
               c:identifier="G_MOUNT_MOUNT_NONE"
               glib:nick="none"/>
     </enumeration>
-    <bitfield name="GMountUnmountFlags"
+    <bitfield name="MountUnmountFlags"
               c:type="GMountUnmountFlags"
               glib:type-name="GMountUnmountFlags"
               glib:get-type="g_mount_unmount_flags_get_type">
@@ -4109,7 +5455,7 @@
               c:identifier="G_MOUNT_UNMOUNT_FORCE"
               glib:nick="force"/>
     </bitfield>
-    <bitfield name="GFileCopyFlags"
+    <bitfield name="FileCopyFlags"
               c:type="GFileCopyFlags"
               glib:type-name="GFileCopyFlags"
               glib:get-type="g_file_copy_flags_get_type">
@@ -4138,7 +5484,7 @@
               c:identifier="G_FILE_COPY_NO_FALLBACK_FOR_MOVE"
               glib:nick="no-fallback-for-move"/>
     </bitfield>
-    <bitfield name="GFileMonitorFlags"
+    <bitfield name="FileMonitorFlags"
               c:type="GFileMonitorFlags"
               glib:type-name="GFileMonitorFlags"
               glib:get-type="g_file_monitor_flags_get_type">
@@ -4149,376 +5495,345 @@
       <member name="watch-mounts"
               value="1"
               c:identifier="G_FILE_MONITOR_WATCH_MOUNTS"
-              glib:nick="watch-mounts"/>
-    </bitfield>
-    <record name="File" c:type="GFile"/>
-    <record name="FileMonitor" c:type="GFileMonitor"/>
-    <record name="Mount" c:type="GMount"/>
-    <callback name="GFileProgressCallback">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="current_num_bytes">
-          <type name="goffset" c:type="goffset"/>
-        </parameter>
-        <parameter name="total_num_bytes">
-          <type name="goffset" c:type="goffset"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GFileReadMoreCallback">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_contents">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="file_size">
-          <type name="goffset" c:type="goffset"/>
-        </parameter>
-        <parameter name="callback_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="GFile"
+              glib:nick="watch-mounts"/>
+    </bitfield>
+    <interface name="File"
                c:type="GFile"
                glib:type-name="GFile"
                glib:get-type="g_file_get_type">
-      <callback name="dup">
+      <callback name="dup" c:type="dup">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="hash">
+      <callback name="hash" c:type="hash">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="equal">
+      <callback name="equal" c:type="equal">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file1">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="file2">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_native">
+      <callback name="is_native" c:type="is_native">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="has_uri_scheme">
+      <callback name="has_uri_scheme" c:type="has_uri_scheme">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="uri_scheme">
             <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_uri_scheme">
+      <callback name="et_uri_scheme" c:type="get_uri_scheme">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_basename">
+      <callback name="et_basename" c:type="get_basename">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_path">
+      <callback name="et_path" c:type="get_path">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_uri">
+      <callback name="et_uri" c:type="get_uri">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_parse_name">
+      <callback name="et_parse_name" c:type="get_parse_name">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_parent">
+      <callback name="et_parent" c:type="get_parent">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="prefix_matches">
+      <callback name="prefix_matches" c:type="prefix_matches">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="prefix">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_relative_path">
+      <callback name="et_relative_path" c:type="get_relative_path">
         <return-value>
           <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="parent">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="descendant">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="resolve_relative_path">
+      <callback name="resolve_relative_path" c:type="resolve_relative_path">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="relative_path">
             <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_child_for_display_name">
+      <callback name="et_child_for_display_name"
+                c:type="get_child_for_display_name">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="display_name">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="enumerate_children">
+      <callback name="enumerate_children" c:type="enumerate_children">
         <return-value>
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
+          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="enumerate_children_async">
+      <callback name="enumerate_children_async"
+                c:type="enumerate_children_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="enumerate_children_finish">
+      <callback name="enumerate_children_finish"
+                c:type="enumerate_children_finish">
         <return-value>
-          <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
+          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_info">
+      <callback name="query_info" c:type="query_info">
         <return-value>
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_info_async">
+      <callback name="query_info_async" c:type="query_info_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_info_finish">
+      <callback name="query_info_finish" c:type="query_info_finish">
         <return-value>
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_filesystem_info">
+      <callback name="query_filesystem_info" c:type="query_filesystem_info">
         <return-value>
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_filesystem_info_async">
+      <callback name="query_filesystem_info_async"
+                c:type="query_filesystem_info_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
@@ -4527,112 +5842,115 @@
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_filesystem_info_finish">
+      <callback name="query_filesystem_info_finish"
+                c:type="query_filesystem_info_finish">
         <return-value>
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="find_enclosing_mount">
+      <callback name="find_enclosing_mount" c:type="find_enclosing_mount">
         <return-value>
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="find_enclosing_mount_async">
+      <callback name="find_enclosing_mount_async"
+                c:type="find_enclosing_mount_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="find_enclosing_mount_finish">
+      <callback name="find_enclosing_mount_finish"
+                c:type="find_enclosing_mount_finish">
         <return-value>
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_display_name">
+      <callback name="set_display_name" c:type="set_display_name">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="display_name">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_display_name_async">
+      <callback name="set_display_name_async" c:type="set_display_name_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="display_name">
             <type name="string" c:type="char*"/>
@@ -4641,364 +5959,370 @@
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_display_name_finish">
+      <callback name="set_display_name_finish"
+                c:type="set_display_name_finish">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_settable_attributes">
+      <callback name="query_settable_attributes"
+                c:type="query_settable_attributes">
         <return-value>
-          <type name="GFileAttributeInfoList"
-                c:type="GFileAttributeInfoList*"/>
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_query_settable_attributes_async">
+      <callback name="query_settable_attributes_async"
+                c:type="_query_settable_attributes_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_query_settable_attributes_finish">
+      <callback name="query_settable_attributes_finish"
+                c:type="_query_settable_attributes_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="query_writable_namespaces">
+      <callback name="query_writable_namespaces"
+                c:type="query_writable_namespaces">
         <return-value>
-          <type name="GFileAttributeInfoList"
-                c:type="GFileAttributeInfoList*"/>
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_query_writable_namespaces_async">
+      <callback name="query_writable_namespaces_async"
+                c:type="_query_writable_namespaces_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_query_writable_namespaces_finish">
+      <callback name="query_writable_namespaces_finish"
+                c:type="_query_writable_namespaces_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="set_attribute">
+      <callback name="set_attribute" c:type="set_attribute">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="attribute">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="type">
-            <type name="GFileAttributeType" c:type="GFileAttributeType"/>
+            <type name="FileAttributeType" c:type="GFileAttributeType"/>
           </parameter>
           <parameter name="value_p">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_attributes_from_info">
+      <callback name="set_attributes_from_info"
+                c:type="set_attributes_from_info">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="info">
-            <type name="GFileInfo" c:type="GFileInfo*"/>
+            <type name="FileInfo" c:type="GFileInfo*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_attributes_async">
+      <callback name="set_attributes_async" c:type="set_attributes_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="info">
-            <type name="GFileInfo" c:type="GFileInfo*"/>
+            <type name="FileInfo" c:type="GFileInfo*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_attributes_finish">
+      <callback name="set_attributes_finish" c:type="set_attributes_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="info">
-            <type name="GFileInfo" c:type="GFileInfo**"/>
+            <type name="FileInfo" c:type="GFileInfo**"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="read_fn">
+      <callback name="read_fn" c:type="read_fn">
         <return-value>
-          <type name="GFileInputStream" c:type="GFileInputStream*"/>
+          <type name="FileInputStream" c:type="GFileInputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="read_async">
+      <callback name="read_async" c:type="read_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="read_finish">
+      <callback name="read_finish" c:type="read_finish">
         <return-value>
-          <type name="GFileInputStream" c:type="GFileInputStream*"/>
+          <type name="FileInputStream" c:type="GFileInputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="append_to">
+      <callback name="append_to" c:type="append_to">
         <return-value>
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="append_to_async">
+      <callback name="append_to_async" c:type="append_to_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="append_to_finish">
+      <callback name="append_to_finish" c:type="append_to_finish">
         <return-value>
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="create">
+      <callback name="create" c:type="create">
         <return-value>
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="create_async">
+      <callback name="create_async" c:type="create_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="create_finish">
+      <callback name="create_finish" c:type="create_finish">
         <return-value>
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="replace">
+      <callback name="replace" c:type="replace">
         <return-value>
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="etag">
             <type name="string" c:type="char*"/>
@@ -5007,23 +6331,23 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="replace_async">
+      <callback name="replace_async" c:type="replace_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="etag">
             <type name="string" c:type="char*"/>
@@ -5032,461 +6356,864 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="replace_finish">
+      <callback name="replace_finish" c:type="replace_finish">
         <return-value>
-          <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_file">
+      <callback name="delete_file" c:type="delete_file">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_delete_file_async">
+      <callback name="delete_file_async" c:type="_delete_file_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_delete_file_finish">
+      <callback name="delete_file_finish" c:type="_delete_file_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="trash">
+      <callback name="trash" c:type="trash">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_trash_async">
+      <callback name="trash_async" c:type="_trash_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_trash_finish">
+      <callback name="trash_finish" c:type="_trash_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="make_directory">
+      <callback name="make_directory" c:type="make_directory">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_make_directory_async">
+      <callback name="make_directory_async" c:type="_make_directory_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_make_directory_finish">
+      <callback name="make_directory_finish" c:type="_make_directory_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="make_symbolic_link">
+      <callback name="make_symbolic_link" c:type="make_symbolic_link">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="symlink_value">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_make_symbolic_link_async">
+      <callback name="make_symbolic_link_async"
+                c:type="_make_symbolic_link_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_make_symbolic_link_finish">
+      <callback name="make_symbolic_link_finish"
+                c:type="_make_symbolic_link_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="copy">
+      <callback name="copy" c:type="copy">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="destination">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCopyFlags" c:type="GFileCopyFlags"/>
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="progress_callback">
-            <type name="GFileProgressCallback" c:type="GFileProgressCallback"/>
+            <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
           <parameter name="progress_callback_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_async">
+      <callback name="copy_async" c:type="copy_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="destination">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCopyFlags" c:type="GFileCopyFlags"/>
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
           </parameter>
           <parameter name="io_priority">
             <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="progress_callback">
-            <type name="GFileProgressCallback" c:type="GFileProgressCallback"/>
+            <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
           <parameter name="progress_callback_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_finish">
+      <callback name="copy_finish" c:type="copy_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="move">
+      <callback name="move" c:type="move">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="destination">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileCopyFlags" c:type="GFileCopyFlags"/>
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="progress_callback">
-            <type name="GFileProgressCallback" c:type="GFileProgressCallback"/>
+            <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
           <parameter name="progress_callback_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_move_async">
+      <callback name="move_async" c:type="_move_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_move_finish">
+      <callback name="move_finish" c:type="_move_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="mount_mountable">
+      <callback name="mount_mountable" c:type="mount_mountable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GMountMountFlags" c:type="GMountMountFlags"/>
+            <type name="MountMountFlags" c:type="GMountMountFlags"/>
           </parameter>
           <parameter name="mount_operation">
-            <type name="GMountOperation" c:type="GMountOperation*"/>
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="mount_mountable_finish">
+      <callback name="mount_mountable_finish" c:type="mount_mountable_finish">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unmount_mountable">
+      <callback name="unmount_mountable" c:type="unmount_mountable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unmount_mountable_finish">
+      <callback name="unmount_mountable_finish"
+                c:type="unmount_mountable_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_mountable">
+      <callback name="eject_mountable" c:type="eject_mountable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_mountable_finish">
+      <callback name="eject_mountable_finish" c:type="eject_mountable_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="mount_enclosing_volume">
+      <callback name="mount_enclosing_volume" c:type="mount_enclosing_volume">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="location">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GMountMountFlags" c:type="GMountMountFlags"/>
+            <type name="MountMountFlags" c:type="GMountMountFlags"/>
           </parameter>
           <parameter name="mount_operation">
-            <type name="GMountOperation" c:type="GMountOperation*"/>
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="mount_enclosing_volume_finish">
+      <callback name="mount_enclosing_volume_finish"
+                c:type="mount_enclosing_volume_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="location">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="monitor_dir" c:type="monitor_dir">
+        <return-value>
+          <type name="FileMonitor" c:type="GFileMonitor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileMonitorFlags" c:type="GFileMonitorFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="monitor_dir">
+      <callback name="monitor_file" c:type="monitor_file">
         <return-value>
-          <type name="GFileMonitor" c:type="GFileMonitor*"/>
+          <type name="FileMonitor" c:type="GFileMonitor*"/>
         </return-value>
         <parameters>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileMonitorFlags" c:type="GFileMonitorFlags"/>
+            <type name="FileMonitorFlags" c:type="GFileMonitorFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="monitor_file">
+    </interface>
+    <class name="FileMonitor"
+           c:type="GFileMonitor"
+           parent="Object"
+           glib:type-name="GFileMonitor"
+           glib:get-type="g_file_monitor_get_type">
+      <method name="cancel" c:identifier="g_file_monitor_cancel">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_cancelled" c:identifier="g_file_monitor_is_cancelled">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_rate_limit"
+              c:identifier="g_file_monitor_set_rate_limit">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
+          <parameter name="limit_msecs">
+            <type name="int32" c:type="int"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="emit_event" c:identifier="g_file_monitor_emit_event">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="other_file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="event_type">
+            <type name="FileMonitorEvent" c:type="GFileMonitorEvent"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="rate-limit">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="cancelled">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="changed" c:type="changed">
         <return-value>
-          <type name="GFileMonitor" c:type="GFileMonitor*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
           <parameter name="file">
-            <type name="GFile" c:type="GFile*"/>
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="other_file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="event_type">
+            <type name="FileMonitorEvent" c:type="GFileMonitorEvent"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cancel" c:type="cancel">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="File" c:type="GFile"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="File" c:type="GFile"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="FileMonitorEvent" c:type="GFileMonitorEvent"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <interface name="Mount"
+               c:type="GMount"
+               glib:type-name="GMount"
+               glib:get-type="g_mount_get_type">
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unmounted" c:type="unmounted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_root" c:type="get_root">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_name" c:type="get_name">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_icon" c:type="get_icon">
+        <return-value>
+          <type name="Icon" c:type="GIcon*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_uuid" c:type="get_uuid">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_volume" c:type="get_volume">
+        <return-value>
+          <type name="Volume" c:type="GVolume*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_drive" c:type="get_drive">
+        <return-value>
+          <type name="Drive" c:type="GDrive*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_unmount" c:type="can_unmount">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_eject" c:type="can_eject">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unmount" c:type="unmount">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unmount_finish" c:type="unmount_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="eject" c:type="eject">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="eject_finish" c:type="eject_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remount" c:type="remount">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GFileMonitorFlags" c:type="GFileMonitorFlags"/>
+            <type name="MountMountFlags" c:type="GMountMountFlags"/>
+          </parameter>
+          <parameter name="mount_operation">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remount_finish" c:type="remount_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="unmounted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </interface>
+    <callback name="FileProgressCallback" c:type="GFileProgressCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="current_num_bytes">
+          <type name="offset" c:type="goffset"/>
+        </parameter>
+        <parameter name="total_num_bytes">
+          <type name="offset" c:type="goffset"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="FileReadMoreCallback" c:type="GFileReadMoreCallback">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_contents">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="file_size">
+          <type name="offset" c:type="goffset"/>
+        </parameter>
+        <parameter name="callback_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
     <function name="file_new_for_path" c:identifier="g_file_new_for_path">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="path">
@@ -5496,7 +7223,7 @@
     </function>
     <function name="file_new_for_uri" c:identifier="g_file_new_for_uri">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="uri">
@@ -5507,7 +7234,7 @@
     <function name="file_new_for_commandline_arg"
               c:identifier="g_file_new_for_commandline_arg">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="arg">
@@ -5517,7 +7244,7 @@
     </function>
     <function name="file_parse_name" c:identifier="g_file_parse_name">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="parse_name">
@@ -5527,17 +7254,17 @@
     </function>
     <function name="file_dup" c:identifier="g_file_dup">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_hash" c:identifier="g_file_hash">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="file">
@@ -5551,10 +7278,10 @@
       </return-value>
       <parameters>
         <parameter name="file1">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="file2">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -5564,7 +7291,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -5574,7 +7301,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -5584,7 +7311,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -5594,27 +7321,27 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_get_parent" c:identifier="g_file_get_parent">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_get_child" c:identifier="g_file_get_child">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="name">
           <type name="string" c:type="char*"/>
@@ -5624,17 +7351,17 @@
     <function name="file_get_child_for_display_name"
               c:identifier="g_file_get_child_for_display_name">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="display_name">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5644,10 +7371,10 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="prefix">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -5658,21 +7385,21 @@
       </return-value>
       <parameters>
         <parameter name="parent">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="descendant">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_resolve_relative_path"
               c:identifier="g_file_resolve_relative_path">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="relative_path">
           <type name="string" c:type="char*"/>
@@ -5685,7 +7412,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -5695,7 +7422,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="uri_scheme">
           <type name="string" c:type="char*"/>
@@ -5708,23 +7435,23 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_read" c:identifier="g_file_read">
       <return-value>
-        <type name="GFileInputStream" c:type="GFileInputStream*"/>
+        <type name="FileInputStream" c:type="GFileInputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5734,16 +7461,16 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -5752,65 +7479,65 @@
     </function>
     <function name="file_read_finish" c:identifier="g_file_read_finish">
       <return-value>
-        <type name="GFileInputStream" c:type="GFileInputStream*"/>
+        <type name="FileInputStream" c:type="GFileInputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_append_to" c:identifier="g_file_append_to">
       <return-value>
-        <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_create" c:identifier="g_file_create">
       <return-value>
-        <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_replace" c:identifier="g_file_replace">
       <return-value>
-        <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="etag">
           <type name="string" c:type="char*"/>
@@ -5819,13 +7546,13 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5836,19 +7563,19 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -5858,17 +7585,17 @@
     <function name="file_append_to_finish"
               c:identifier="g_file_append_to_finish">
       <return-value>
-        <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5878,19 +7605,19 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -5899,17 +7626,17 @@
     </function>
     <function name="file_create_finish" c:identifier="g_file_create_finish">
       <return-value>
-        <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5919,7 +7646,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="etag">
           <type name="string" c:type="char*"/>
@@ -5928,16 +7655,16 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -5946,17 +7673,17 @@
     </function>
     <function name="file_replace_finish" c:identifier="g_file_replace_finish">
       <return-value>
-        <type name="GFileOutputStream" c:type="GFileOutputStream*"/>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5966,32 +7693,32 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_query_info" c:identifier="g_file_query_info">
       <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
+        <type name="FileInfo" c:type="GFileInfo*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attributes">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6002,22 +7729,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attributes">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6027,37 +7754,37 @@
     <function name="file_query_info_finish"
               c:identifier="g_file_query_info_finish">
       <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
+        <type name="FileInfo" c:type="GFileInfo*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_query_filesystem_info"
               c:identifier="g_file_query_filesystem_info">
       <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
+        <type name="FileInfo" c:type="GFileInfo*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attributes">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6068,7 +7795,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attributes">
           <type name="string" c:type="char*"/>
@@ -6077,10 +7804,10 @@
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6090,34 +7817,34 @@
     <function name="file_query_filesystem_info_finish"
               c:identifier="g_file_query_filesystem_info_finish">
       <return-value>
-        <type name="GFileInfo" c:type="GFileInfo*"/>
+        <type name="FileInfo" c:type="GFileInfo*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_find_enclosing_mount"
               c:identifier="g_file_find_enclosing_mount">
       <return-value>
-        <type name="GMount" c:type="GMount*"/>
+        <type name="Mount" c:type="GMount*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6128,16 +7855,16 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6147,40 +7874,40 @@
     <function name="file_find_enclosing_mount_finish"
               c:identifier="g_file_find_enclosing_mount_finish">
       <return-value>
-        <type name="GMount" c:type="GMount*"/>
+        <type name="Mount" c:type="GMount*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_enumerate_children"
               c:identifier="g_file_enumerate_children">
       <return-value>
-        <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
+        <type name="FileEnumerator" c:type="GFileEnumerator*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attributes">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6191,22 +7918,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attributes">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6216,37 +7943,37 @@
     <function name="file_enumerate_children_finish"
               c:identifier="g_file_enumerate_children_finish">
       <return-value>
-        <type name="GFileEnumerator" c:type="GFileEnumerator*"/>
+        <type name="FileEnumerator" c:type="GFileEnumerator*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_set_display_name"
               c:identifier="g_file_set_display_name">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="display_name">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6257,7 +7984,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="display_name">
           <type name="string" c:type="char*"/>
@@ -6266,10 +7993,10 @@
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6279,17 +8006,17 @@
     <function name="file_set_display_name_finish"
               c:identifier="g_file_set_display_name_finish">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6299,13 +8026,13 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6315,13 +8042,13 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6331,25 +8058,25 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="destination">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCopyFlags" c:type="GFileCopyFlags"/>
+          <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="progress_callback">
-          <type name="GFileProgressCallback" c:type="GFileProgressCallback"/>
+          <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
         </parameter>
         <parameter name="progress_callback_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6359,28 +8086,28 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="destination">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCopyFlags" c:type="GFileCopyFlags"/>
+          <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="progress_callback">
-          <type name="GFileProgressCallback" c:type="GFileProgressCallback"/>
+          <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
         </parameter>
         <parameter name="progress_callback_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6393,13 +8120,13 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6409,25 +8136,25 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="destination">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCopyFlags" c:type="GFileCopyFlags"/>
+          <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="progress_callback">
-          <type name="GFileProgressCallback" c:type="GFileProgressCallback"/>
+          <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
         </parameter>
         <parameter name="progress_callback_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6437,13 +8164,13 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6454,50 +8181,50 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="symlink_value">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_query_settable_attributes"
               c:identifier="g_file_query_settable_attributes">
       <return-value>
-        <type name="GFileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+        <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_query_writable_namespaces"
               c:identifier="g_file_query_writable_namespaces">
       <return-value>
-        <type name="GFileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+        <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6507,25 +8234,25 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attribute">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="type">
-          <type name="GFileAttributeType" c:type="GFileAttributeType"/>
+          <type name="FileAttributeType" c:type="GFileAttributeType"/>
         </parameter>
         <parameter name="value_p">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6536,19 +8263,19 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6559,22 +8286,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="io_priority">
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6588,16 +8315,16 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="info">
-          <type name="GFileInfo" c:type="GFileInfo**"/>
+          <type name="FileInfo" c:type="GFileInfo**"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6608,7 +8335,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attribute">
           <type name="string" c:type="char*"/>
@@ -6617,13 +8344,13 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6634,7 +8361,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attribute">
           <type name="string" c:type="char*"/>
@@ -6643,13 +8370,13 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6660,7 +8387,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attribute">
           <type name="string" c:type="char*"/>
@@ -6669,13 +8396,13 @@
           <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6686,7 +8413,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attribute">
           <type name="string" c:type="char*"/>
@@ -6695,13 +8422,13 @@
           <type name="int32" c:type="gint32"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6712,22 +8439,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attribute">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="value">
-          <type name="guint64" c:type="guint64"/>
+          <type name="uint64" c:type="guint64"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6738,22 +8465,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="attribute">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="value">
-          <type name="gint64" c:type="gint64"/>
+          <type name="int64" c:type="gint64"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6764,19 +8491,19 @@
       </return-value>
       <parameters>
         <parameter name="location">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMountMountFlags" c:type="GMountMountFlags"/>
+          <type name="MountMountFlags" c:type="GMountMountFlags"/>
         </parameter>
         <parameter name="mount_operation">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
+          <type name="MountOperation" c:type="GMountOperation*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6790,13 +8517,13 @@
       </return-value>
       <parameters>
         <parameter name="location">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6807,19 +8534,19 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMountMountFlags" c:type="GMountMountFlags"/>
+          <type name="MountMountFlags" c:type="GMountMountFlags"/>
         </parameter>
         <parameter name="mount_operation">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
+          <type name="MountOperation" c:type="GMountOperation*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6829,17 +8556,17 @@
     <function name="file_mount_mountable_finish"
               c:identifier="g_file_mount_mountable_finish">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6850,16 +8577,16 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+          <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6873,13 +8600,13 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6890,16 +8617,16 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+          <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6913,13 +8640,13 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -6930,75 +8657,75 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="destination">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCopyFlags" c:type="GFileCopyFlags"/>
+          <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_monitor_directory"
               c:identifier="g_file_monitor_directory">
       <return-value>
-        <type name="GFileMonitor" c:type="GFileMonitor*"/>
+        <type name="FileMonitor" c:type="GFileMonitor*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileMonitorFlags" c:type="GFileMonitorFlags"/>
+          <type name="FileMonitorFlags" c:type="GFileMonitorFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_monitor_file" c:identifier="g_file_monitor_file">
       <return-value>
-        <type name="GFileMonitor" c:type="GFileMonitor*"/>
+        <type name="FileMonitor" c:type="GFileMonitor*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileMonitorFlags" c:type="GFileMonitorFlags"/>
+          <type name="FileMonitorFlags" c:type="GFileMonitorFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_query_default_handler"
               c:identifier="g_file_query_default_handler">
       <return-value>
-        <type name="GAppInfo" c:type="GAppInfo*"/>
+        <type name="AppInfo" c:type="GAppInfo*"/>
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -7008,22 +8735,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="contents">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="etag_out">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -7034,13 +8761,13 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7054,22 +8781,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="contents">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="etag_out">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -7080,16 +8807,16 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="read_more_callback">
-          <type name="GFileReadMoreCallback" c:type="GFileReadMoreCallback"/>
+          <type name="FileReadMoreCallback" c:type="GFileReadMoreCallback"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7103,22 +8830,22 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="contents">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="etag_out">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -7129,7 +8856,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="contents">
           <type name="string" c:type="char*"/>
@@ -7144,16 +8871,16 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="new_etag">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -7164,7 +8891,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="contents">
           <type name="string" c:type="char*"/>
@@ -7179,13 +8906,13 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="flags">
-          <type name="GFileCreateFlags" c:type="GFileCreateFlags"/>
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7199,239 +8926,454 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
+          <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="new_etag">
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <record name="Volume" c:type="GVolume"/>
-    <record name="Drive" c:type="GDrive"/>
-    <interface name="GMount"
-               c:type="GMount"
-               glib:type-name="GMount"
-               glib:get-type="g_mount_get_type">
-      <callback name="changed">
+    <interface name="Volume"
+               c:type="GVolume"
+               glib:type-name="GVolume"
+               glib:get-type="g_volume_get_type">
+      <callback name="changed" c:type="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unmounted">
+      <callback name="removed" c:type="removed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_root">
+      <callback name="et_name" c:type="get_name">
         <return-value>
-          <type name="GFile" c:type="GFile*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_name">
+      <callback name="et_icon" c:type="get_icon">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="Icon" c:type="GIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_icon">
+      <callback name="et_uuid" c:type="get_uuid">
         <return-value>
-          <type name="GIcon" c:type="GIcon*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_uuid">
+      <callback name="et_drive" c:type="get_drive">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="Drive" c:type="GDrive*"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_volume">
+      <callback name="et_mount" c:type="get_mount">
         <return-value>
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_drive">
+      <callback name="can_mount" c:type="can_mount">
         <return-value>
-          <type name="GDrive" c:type="GDrive*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_unmount">
+      <callback name="can_eject" c:type="can_eject">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="mount_fn" c:type="mount_fn">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="MountMountFlags" c:type="GMountMountFlags"/>
+          </parameter>
+          <parameter name="mount_operation">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_eject">
+      <callback name="mount_finish" c:type="mount_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unmount">
+      <callback name="eject" c:type="eject">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unmount_finish">
+      <callback name="eject_finish" c:type="eject_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
           <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_identifier" c:type="get_identifier">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+          <parameter name="kind">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="enumerate_identifiers" c:type="enumerate_identifiers">
+        <return-value>
+          <type name="char" c:type="char**"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="should_automount" c:type="should_automount">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <interface name="Drive"
+               c:type="GDrive"
+               glib:type-name="GDrive"
+               glib:get-type="g_drive_get_type">
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject">
+      <callback name="disconnected" c:type="disconnected">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="eject_button" c:type="eject_button">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_name" c:type="get_name">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_icon" c:type="get_icon">
+        <return-value>
+          <type name="Icon" c:type="GIcon*"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="has_volumes" c:type="has_volumes">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_volumes" c:type="get_volumes">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_media_removable" c:type="is_media_removable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="has_media" c:type="has_media">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_media_check_automatic"
+                c:type="is_media_check_automatic">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_eject" c:type="can_eject">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_poll_for_media" c:type="can_poll_for_media">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="eject" c:type="eject">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="eject_finish" c:type="eject_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="poll_for_media" c:type="poll_for_media">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_finish">
+      <callback name="poll_for_media_finish" c:type="poll_for_media_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
           <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remount">
+      <callback name="et_identifier" c:type="get_identifier">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="GMountMountFlags" c:type="GMountMountFlags"/>
-          </parameter>
-          <parameter name="mount_operation">
-            <type name="GMountOperation" c:type="GMountOperation*"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="kind">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remount_finish">
+      <callback name="enumerate_identifiers" c:type="enumerate_identifiers">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="char" c:type="char**"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="GMount" c:type="GMount*"/>
-          </parameter>
-          <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7440,7 +9382,12 @@
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="unmounted">
+      <glib:signal name="disconnected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="eject-button">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7448,11 +9395,11 @@
     </interface>
     <function name="mount_get_root" c:identifier="g_mount_get_root">
       <return-value>
-        <type name="GFile" c:type="GFile*"/>
+        <type name="File" c:type="GFile*"/>
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
@@ -7462,17 +9409,17 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
     <function name="mount_get_icon" c:identifier="g_mount_get_icon">
       <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
+        <type name="Icon" c:type="GIcon*"/>
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
@@ -7482,27 +9429,27 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
     <function name="mount_get_volume" c:identifier="g_mount_get_volume">
       <return-value>
-        <type name="GVolume" c:type="GVolume*"/>
+        <type name="Volume" c:type="GVolume*"/>
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
     <function name="mount_get_drive" c:identifier="g_mount_get_drive">
       <return-value>
-        <type name="GDrive" c:type="GDrive*"/>
+        <type name="Drive" c:type="GDrive*"/>
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
@@ -7512,7 +9459,7 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
@@ -7522,7 +9469,7 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
@@ -7532,16 +9479,16 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+          <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7555,13 +9502,13 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -7571,16 +9518,16 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+          <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7593,13 +9540,13 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -7609,19 +9556,19 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMountMountFlags" c:type="GMountMountFlags"/>
+          <type name="MountMountFlags" c:type="GMountMountFlags"/>
         </parameter>
         <parameter name="mount_operation">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
+          <type name="MountOperation" c:type="GMountOperation*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7635,1295 +9582,1332 @@
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
         <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <interface name="GVolume"
-               c:type="GVolume"
-               glib:type-name="GVolume"
-               glib:get-type="g_volume_get_type">
-      <callback name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="removed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_name">
-        <return-value>
-          <type name="string" c:type="char*"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_icon">
-        <return-value>
-          <type name="GIcon" c:type="GIcon*"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_uuid">
-        <return-value>
-          <type name="string" c:type="char*"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_drive">
-        <return-value>
-          <type name="GDrive" c:type="GDrive*"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_mount">
-        <return-value>
-          <type name="GMount" c:type="GMount*"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="can_mount">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="can_eject">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="mount_fn">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="GMountMountFlags" c:type="GMountMountFlags"/>
-          </parameter>
-          <parameter name="mount_operation">
-            <type name="GMountOperation" c:type="GMountOperation*"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="mount_finish">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-          <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="eject">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="eject_finish">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-          <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_identifier">
-        <return-value>
-          <type name="string" c:type="char*"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-          <parameter name="kind">
-            <type name="string" c:type="char*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="enumerate_identifiers">
-        <return-value>
-          <type name="char" c:type="char**"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="should_automount">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="volume">
-            <type name="GVolume" c:type="GVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="removed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
     <function name="volume_get_name" c:identifier="g_volume_get_name">
       <return-value>
         <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="volume_get_icon" c:identifier="g_volume_get_icon">
+      <return-value>
+        <type name="Icon" c:type="GIcon*"/>
+      </return-value>
+      <parameters>
+        <parameter name="volume">
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="volume_get_uuid" c:identifier="g_volume_get_uuid">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="volume">
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="volume_get_drive" c:identifier="g_volume_get_drive">
+      <return-value>
+        <type name="Drive" c:type="GDrive*"/>
+      </return-value>
+      <parameters>
+        <parameter name="volume">
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="volume_get_mount" c:identifier="g_volume_get_mount">
+      <return-value>
+        <type name="Mount" c:type="GMount*"/>
+      </return-value>
+      <parameters>
+        <parameter name="volume">
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="volume_can_mount" c:identifier="g_volume_can_mount">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="volume">
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="volume_can_eject" c:identifier="g_volume_can_eject">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="volume">
+          <type name="Volume" c:type="GVolume*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_get_icon" c:identifier="g_volume_get_icon">
+    <function name="volume_should_automount"
+              c:identifier="g_volume_should_automount">
       <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_get_uuid" c:identifier="g_volume_get_uuid">
+    <function name="volume_mount" c:identifier="g_volume_mount">
       <return-value>
-        <type name="string" c:type="char*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="MountMountFlags" c:type="GMountMountFlags"/>
+        </parameter>
+        <parameter name="mount_operation">
+          <type name="MountOperation" c:type="GMountOperation*"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="callback">
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_get_drive" c:identifier="g_volume_get_drive">
+    <function name="volume_mount_finish" c:identifier="g_volume_mount_finish">
       <return-value>
-        <type name="GDrive" c:type="GDrive*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+        <parameter name="result">
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_get_mount" c:identifier="g_volume_get_mount">
+    <function name="volume_eject" c:identifier="g_volume_eject">
       <return-value>
-        <type name="GMount" c:type="GMount*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="callback">
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_can_mount" c:identifier="g_volume_can_mount">
+    <function name="volume_eject_finish" c:identifier="g_volume_eject_finish">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+        <parameter name="result">
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_can_eject" c:identifier="g_volume_can_eject">
+    <function name="volume_get_identifier"
+              c:identifier="g_volume_get_identifier">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
+        </parameter>
+        <parameter name="kind">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_should_automount"
-              c:identifier="g_volume_should_automount">
+    <function name="volume_enumerate_identifiers"
+              c:identifier="g_volume_enumerate_identifiers">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="char" c:type="char**"/>
       </return-value>
       <parameters>
         <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+          <type name="Volume" c:type="GVolume*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_mount" c:identifier="g_volume_mount">
+    <function name="drive_get_name" c:identifier="g_drive_get_name">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_get_icon" c:identifier="g_drive_get_icon">
+      <return-value>
+        <type name="Icon" c:type="GIcon*"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_has_volumes" c:identifier="g_drive_has_volumes">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_get_volumes" c:identifier="g_drive_get_volumes">
+      <return-value>
+        <type name="GLib.List" c:type="GList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_is_media_removable"
+              c:identifier="g_drive_is_media_removable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_has_media" c:identifier="g_drive_has_media">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_is_media_check_automatic"
+              c:identifier="g_drive_is_media_check_automatic">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_can_poll_for_media"
+              c:identifier="g_drive_can_poll_for_media">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_can_eject" c:identifier="g_drive_can_eject">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_eject" c:identifier="g_drive_eject">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="callback">
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_eject_finish" c:identifier="g_drive_eject_finish">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+        <parameter name="result">
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_poll_for_media"
+              c:identifier="g_drive_poll_for_media">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="callback">
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_poll_for_media_finish"
+              c:identifier="g_drive_poll_for_media_finish">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+        <parameter name="result">
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_get_identifier"
+              c:identifier="g_drive_get_identifier">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+        <parameter name="kind">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_enumerate_identifiers"
+              c:identifier="g_drive_enumerate_identifiers">
+      <return-value>
+        <type name="char" c:type="char**"/>
+      </return-value>
+      <parameters>
+        <parameter name="drive">
+          <type name="Drive" c:type="GDrive*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <interface name="LoadableIcon"
+               c:type="GLoadableIcon"
+               glib:type-name="GLoadableIcon"
+               glib:get-type="g_loadable_icon_get_type">
+      <callback name="load" c:type="load">
+        <return-value>
+          <type name="InputStream" c:type="GInputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon">
+            <type name="LoadableIcon" c:type="GLoadableIcon*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="type">
+            <type name="char" c:type="char**"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="load_async" c:type="load_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon">
+            <type name="LoadableIcon" c:type="GLoadableIcon*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="load_finish" c:type="load_finish">
+        <return-value>
+          <type name="InputStream" c:type="GInputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon">
+            <type name="LoadableIcon" c:type="GLoadableIcon*"/>
+          </parameter>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="char" c:type="char**"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </interface>
+    <function name="loadable_icon_load" c:identifier="g_loadable_icon_load">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="InputStream" c:type="GInputStream*"/>
       </return-value>
       <parameters>
-        <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+        <parameter name="icon">
+          <type name="LoadableIcon" c:type="GLoadableIcon*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GMountMountFlags" c:type="GMountMountFlags"/>
+        <parameter name="size">
+          <type name="int32" c:type="int"/>
         </parameter>
-        <parameter name="mount_operation">
-          <type name="GMountOperation" c:type="GMountOperation*"/>
+        <parameter name="type">
+          <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="volume_mount_finish" c:identifier="g_volume_mount_finish">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_eject" c:identifier="g_volume_eject">
+    <function name="loadable_icon_load_async"
+              c:identifier="g_loadable_icon_load_async">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+        <parameter name="icon">
+          <type name="LoadableIcon" c:type="GLoadableIcon*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
+        <parameter name="size">
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_eject_finish" c:identifier="g_volume_eject_finish">
+    <function name="loadable_icon_load_finish"
+              c:identifier="g_loadable_icon_load_finish">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="InputStream" c:type="GInputStream*"/>
       </return-value>
       <parameters>
-        <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
+        <parameter name="icon">
+          <type name="LoadableIcon" c:type="GLoadableIcon*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="res">
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="volume_get_identifier"
-              c:identifier="g_volume_get_identifier">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+        <parameter name="type">
+          <type name="char" c:type="char**"/>
         </parameter>
-        <parameter name="kind">
-          <type name="string" c:type="char*"/>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="volume_enumerate_identifiers"
-              c:identifier="g_volume_enumerate_identifiers">
+    <class name="FileIcon"
+           c:type="GFileIcon"
+           parent="Object"
+           glib:type-name="GFileIcon"
+           glib:get-type="g_file_icon_get_type">
+      <method name="get_file" c:identifier="g_file_icon_get_file">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon">
+            <type name="FileIcon" c:type="GFileIcon*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <function name="file_icon_new" c:identifier="g_file_icon_new">
       <return-value>
-        <type name="char" c:type="char**"/>
+        <type name="Icon" c:type="GIcon*"/>
       </return-value>
       <parameters>
-        <parameter name="volume">
-          <type name="GVolume" c:type="GVolume*"/>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
         </parameter>
       </parameters>
     </function>
-    <interface name="GDrive"
-               c:type="GDrive"
-               glib:type-name="GDrive"
-               glib:get-type="g_drive_get_type">
-      <callback name="changed">
+    <enumeration name="FileMonitorEvent"
+                 c:type="GFileMonitorEvent"
+                 glib:type-name="GFileMonitorEvent"
+                 glib:get-type="g_file_monitor_event_get_type">
+      <member name="changed"
+              value="0"
+              c:identifier="G_FILE_MONITOR_EVENT_CHANGED"
+              glib:nick="changed"/>
+      <member name="changes-done-hint"
+              value="1"
+              c:identifier="G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT"
+              glib:nick="changes-done-hint"/>
+      <member name="deleted"
+              value="2"
+              c:identifier="G_FILE_MONITOR_EVENT_DELETED"
+              glib:nick="deleted"/>
+      <member name="created"
+              value="3"
+              c:identifier="G_FILE_MONITOR_EVENT_CREATED"
+              glib:nick="created"/>
+      <member name="attribute-changed"
+              value="4"
+              c:identifier="G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED"
+              glib:nick="attribute-changed"/>
+      <member name="pre-unmount"
+              value="5"
+              c:identifier="G_FILE_MONITOR_EVENT_PRE_UNMOUNT"
+              glib:nick="pre-unmount"/>
+      <member name="unmounted"
+              value="6"
+              c:identifier="G_FILE_MONITOR_EVENT_UNMOUNTED"
+              glib:nick="unmounted"/>
+    </enumeration>
+    <record name="FileMonitorPrivate" c:type="GFileMonitorPrivate"/>
+    <class name="FilenameCompleter"
+           c:type="GFilenameCompleter"
+           parent="Object"
+           glib:type-name="GFilenameCompleter"
+           glib:get-type="g_filename_completer_get_type">
+      <constructor name="new" c:identifier="g_filename_completer_new">
+        <return-value>
+          <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+        </return-value>
+      </constructor>
+      <method name="get_completion_suffix"
+              c:identifier="g_filename_completer_get_completion_suffix">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="completer">
+            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          </parameter>
+          <parameter name="initial_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_completions"
+              c:identifier="g_filename_completer_get_completions">
+        <return-value>
+          <type name="char" c:type="char**"/>
+        </return-value>
+        <parameters>
+          <parameter name="completer">
+            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          </parameter>
+          <parameter name="initial_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_dirs_only"
+              c:identifier="g_filename_completer_set_dirs_only">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="completer">
+            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          </parameter>
+          <parameter name="dirs_only">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="disconnected">
+      </method>
+      <callback name="ot_completion_data" c:type="got_completion_data">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="filename_completer">
+            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_button">
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="got-completion-data">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </glib:signal>
+    </class>
+    <class name="Vfs"
+           c:type="GVfs"
+           parent="Object"
+           glib:type-name="GVfs"
+           glib:get-type="g_vfs_get_type">
+      <constructor name="get_default" c:identifier="g_vfs_get_default">
+        <return-value>
+          <type name="Vfs" c:type="GVfs*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_local" c:identifier="g_vfs_get_local">
+        <return-value>
+          <type name="Vfs" c:type="GVfs*"/>
+        </return-value>
+      </constructor>
+      <method name="is_active" c:identifier="g_vfs_is_active">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_name">
+      </method>
+      <method name="get_file_for_path" c:identifier="g_vfs_get_file_for_path">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_icon">
+      </method>
+      <method name="get_file_for_uri" c:identifier="g_vfs_get_file_for_uri">
         <return-value>
-          <type name="GIcon" c:type="GIcon*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="has_volumes">
+      </method>
+      <method name="get_supported_uri_schemes"
+              c:identifier="g_vfs_get_supported_uri_schemes">
+        <return-value>
+          <type name="char" c:type="gchar**"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="parse_name" c:identifier="g_vfs_parse_name">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="parse_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="is_active" c:type="is_active">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_volumes">
+      <callback name="et_file_for_path" c:type="get_file_for_path">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_media_removable">
+      <callback name="et_file_for_uri" c:type="get_file_for_uri">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="has_media">
+      <callback name="et_supported_uri_schemes"
+                c:type="get_supported_uri_schemes">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="char" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_media_check_automatic">
+      <callback name="parse_name" c:type="parse_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="parse_name">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_eject">
+      <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved6" c:type="_g_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved7" c:type="_g_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved8" c:type="_g_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="can_poll_for_media">
+      <callback name="g_reserved9" c:type="_g_reserved9">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="eject">
+      <callback name="g_reserved10" c:type="_g_reserved10">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="eject_finish">
+      <callback name="g_reserved11" c:type="_g_reserved11">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
-          </parameter>
-          <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="poll_for_media">
+      <callback name="g_reserved12" c:type="_g_reserved12">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="poll_for_media_finish">
+    </class>
+    <class name="VolumeMonitor"
+           c:type="GVolumeMonitor"
+           parent="Object"
+           glib:type-name="GVolumeMonitor"
+           glib:get-type="g_volume_monitor_get_type">
+      <constructor name="get" c:identifier="g_volume_monitor_get">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+        </return-value>
+      </constructor>
+      <method name="get_connected_drives"
+              c:identifier="g_volume_monitor_get_connected_drives">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
-          </parameter>
-          <parameter name="result">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_identifier">
+      </method>
+      <method name="get_volumes" c:identifier="g_volume_monitor_get_volumes">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
-          </parameter>
-          <parameter name="kind">
-            <type name="string" c:type="char*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="enumerate_identifiers">
+      </method>
+      <method name="get_mounts" c:identifier="g_volume_monitor_get_mounts">
         <return-value>
-          <type name="char" c:type="char**"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="GDrive" c:type="GDrive*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="disconnected">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="eject-button">
+      </method>
+      <method name="get_volume_for_uuid"
+              c:identifier="g_volume_monitor_get_volume_for_uuid">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Volume" c:type="GVolume*"/>
         </return-value>
-      </glib:signal>
-    </interface>
-    <function name="drive_get_name" c:identifier="g_drive_get_name">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_get_icon" c:identifier="g_drive_get_icon">
-      <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_has_volumes" c:identifier="g_drive_has_volumes">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_get_volumes" c:identifier="g_drive_get_volumes">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_is_media_removable"
-              c:identifier="g_drive_is_media_removable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_has_media" c:identifier="g_drive_has_media">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_is_media_check_automatic"
-              c:identifier="g_drive_is_media_check_automatic">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_can_poll_for_media"
-              c:identifier="g_drive_can_poll_for_media">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_can_eject" c:identifier="g_drive_can_eject">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_eject" c:identifier="g_drive_eject">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GMountUnmountFlags" c:type="GMountUnmountFlags"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_eject_finish" c:identifier="g_drive_eject_finish">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_poll_for_media"
-              c:identifier="g_drive_poll_for_media">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_poll_for_media_finish"
-              c:identifier="g_drive_poll_for_media_finish">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-        <parameter name="result">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_get_identifier"
-              c:identifier="g_drive_get_identifier">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-        <parameter name="kind">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drive_enumerate_identifiers"
-              c:identifier="g_drive_enumerate_identifiers">
-      <return-value>
-        <type name="char" c:type="char**"/>
-      </return-value>
-      <parameters>
-        <parameter name="drive">
-          <type name="GDrive" c:type="GDrive*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="LoadableIcon" c:type="GLoadableIcon"/>
-    <interface name="GLoadableIcon"
-               c:type="GLoadableIcon"
-               glib:type-name="GLoadableIcon"
-               glib:get-type="g_loadable_icon_get_type">
-      <callback name="load">
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="uuid">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_mount_for_uuid"
+              c:identifier="g_volume_monitor_get_mount_for_uuid">
         <return-value>
-          <type name="GInputStream" c:type="GInputStream*"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
         <parameters>
-          <parameter name="icon">
-            <type name="GLoadableIcon" c:type="GLoadableIcon*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="int"/>
+          <parameter name="uuid">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="type">
-            <type name="char" c:type="char**"/>
+        </parameters>
+      </method>
+      <callback name="volume_added" c:type="volume_added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+        </parameters>
+      </callback>
+      <callback name="volume_removed" c:type="volume_removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="load_async">
+      <callback name="volume_changed" c:type="volume_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon">
-            <type name="GLoadableIcon" c:type="GLoadableIcon*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="int"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
-          <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+        </parameters>
+      </callback>
+      <callback name="mount_added" c:type="mount_added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </callback>
+      <callback name="mount_removed" c:type="mount_removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="load_finish">
+      <callback name="mount_pre_unmount" c:type="mount_pre_unmount">
         <return-value>
-          <type name="GInputStream" c:type="GInputStream*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon">
-            <type name="GLoadableIcon" c:type="GLoadableIcon*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="res">
-            <type name="GAsyncResult" c:type="GAsyncResult*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
-          <parameter name="type">
-            <type name="char" c:type="char**"/>
+        </parameters>
+      </callback>
+      <callback name="mount_changed" c:type="mount_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
         </parameters>
       </callback>
-    </interface>
-    <function name="loadable_icon_load" c:identifier="g_loadable_icon_load">
-      <return-value>
-        <type name="GInputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GLoadableIcon" c:type="GLoadableIcon*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="type">
-          <type name="char" c:type="char**"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="loadable_icon_load_async"
-              c:identifier="g_loadable_icon_load_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GLoadableIcon" c:type="GLoadableIcon*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="loadable_icon_load_finish"
-              c:identifier="g_loadable_icon_load_finish">
-      <return-value>
-        <type name="GInputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GLoadableIcon" c:type="GLoadableIcon*"/>
-        </parameter>
-        <parameter name="res">
-          <type name="GAsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="char" c:type="char**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FileIcon" c:type="GFileIcon"/>
-    <function name="file_icon_new" c:identifier="g_file_icon_new">
-      <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="GFile" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_icon_get_file" c:identifier="g_file_icon_get_file">
-      <return-value>
-        <type name="GFile" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GFileIcon" c:type="GFileIcon*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <enumeration name="GFileMonitorEvent"
-                 c:type="GFileMonitorEvent"
-                 glib:type-name="GFileMonitorEvent"
-                 glib:get-type="g_file_monitor_event_get_type">
-      <member name="changed"
-              value="0"
-              c:identifier="G_FILE_MONITOR_EVENT_CHANGED"
-              glib:nick="changed"/>
-      <member name="changes-done-hint"
-              value="1"
-              c:identifier="G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT"
-              glib:nick="changes-done-hint"/>
-      <member name="deleted"
-              value="2"
-              c:identifier="G_FILE_MONITOR_EVENT_DELETED"
-              glib:nick="deleted"/>
-      <member name="created"
-              value="3"
-              c:identifier="G_FILE_MONITOR_EVENT_CREATED"
-              glib:nick="created"/>
-      <member name="attribute-changed"
-              value="4"
-              c:identifier="G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED"
-              glib:nick="attribute-changed"/>
-      <member name="pre-unmount"
-              value="5"
-              c:identifier="G_FILE_MONITOR_EVENT_PRE_UNMOUNT"
-              glib:nick="pre-unmount"/>
-      <member name="unmounted"
-              value="6"
-              c:identifier="G_FILE_MONITOR_EVENT_UNMOUNTED"
-              glib:nick="unmounted"/>
-    </enumeration>
-    <record name="FileMonitorPrivate" c:type="GFileMonitorPrivate"/>
-    <function name="file_monitor_cancel" c:identifier="g_file_monitor_cancel">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="monitor">
-          <type name="GFileMonitor" c:type="GFileMonitor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_monitor_is_cancelled"
-              c:identifier="g_file_monitor_is_cancelled">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="monitor">
-          <type name="GFileMonitor" c:type="GFileMonitor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_monitor_set_rate_limit"
-              c:identifier="g_file_monitor_set_rate_limit">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="monitor">
-          <type name="GFileMonitor" c:type="GFileMonitor*"/>
-        </parameter>
-        <parameter name="limit_msecs">
-          <type name="int32" c:type="int"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_monitor_emit_event"
-              c:identifier="g_file_monitor_emit_event">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="monitor">
-          <type name="GFileMonitor" c:type="GFileMonitor*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GFile" c:type="GFile*"/>
-        </parameter>
-        <parameter name="other_file">
-          <type name="GFile" c:type="GFile*"/>
-        </parameter>
-        <parameter name="event_type">
-          <type name="GFileMonitorEvent" c:type="GFileMonitorEvent"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="FilenameCompleter" c:type="GFilenameCompleter"/>
-    <function name="filename_completer_new"
-              c:identifier="g_filename_completer_new">
-      <return-value>
-        <type name="GFilenameCompleter" c:type="GFilenameCompleter*"/>
-      </return-value>
-    </function>
-    <function name="filename_completer_get_completion_suffix"
-              c:identifier="g_filename_completer_get_completion_suffix">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="completer">
-          <type name="GFilenameCompleter" c:type="GFilenameCompleter*"/>
-        </parameter>
-        <parameter name="initial_text">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="filename_completer_get_completions"
-              c:identifier="g_filename_completer_get_completions">
-      <return-value>
-        <type name="char" c:type="char**"/>
-      </return-value>
-      <parameters>
-        <parameter name="completer">
-          <type name="GFilenameCompleter" c:type="GFilenameCompleter*"/>
-        </parameter>
-        <parameter name="initial_text">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="filename_completer_set_dirs_only"
-              c:identifier="g_filename_completer_set_dirs_only">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="completer">
-          <type name="GFilenameCompleter" c:type="GFilenameCompleter*"/>
-        </parameter>
-        <parameter name="dirs_only">
+      <callback name="drive_connected" c:type="drive_connected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drive_disconnected" c:type="drive_disconnected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drive_changed" c:type="drive_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_supported" c:type="is_supported">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="Vfs" c:type="GVfs"/>
-    <function name="vfs_is_active" c:identifier="g_vfs_is_active">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="vfs">
-          <type name="GVfs" c:type="GVfs*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vfs_get_file_for_path"
-              c:identifier="g_vfs_get_file_for_path">
-      <return-value>
-        <type name="GFile" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="vfs">
-          <type name="GVfs" c:type="GVfs*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vfs_get_file_for_uri"
-              c:identifier="g_vfs_get_file_for_uri">
-      <return-value>
-        <type name="GFile" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="vfs">
-          <type name="GVfs" c:type="GVfs*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vfs_get_supported_uri_schemes"
-              c:identifier="g_vfs_get_supported_uri_schemes">
-      <return-value>
-        <type name="GLib.gchar" c:type="gchar**"/>
-      </return-value>
-      <parameters>
-        <parameter name="vfs">
-          <type name="GVfs" c:type="GVfs*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vfs_parse_name" c:identifier="g_vfs_parse_name">
-      <return-value>
-        <type name="GFile" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="vfs">
-          <type name="GVfs" c:type="GVfs*"/>
-        </parameter>
-        <parameter name="parse_name">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vfs_get_default" c:identifier="g_vfs_get_default">
-      <return-value>
-        <type name="GVfs" c:type="GVfs*"/>
-      </return-value>
-    </function>
-    <function name="vfs_get_local" c:identifier="g_vfs_get_local">
-      <return-value>
-        <type name="GVfs" c:type="GVfs*"/>
-      </return-value>
-    </function>
-    <record name="VolumeMonitor" c:type="GVolumeMonitor"/>
-    <function name="volume_monitor_get" c:identifier="g_volume_monitor_get">
-      <return-value>
-        <type name="GVolumeMonitor" c:type="GVolumeMonitor*"/>
-      </return-value>
-    </function>
-    <function name="volume_monitor_get_connected_drives"
-              c:identifier="g_volume_monitor_get_connected_drives">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="volume_monitor">
-          <type name="GVolumeMonitor" c:type="GVolumeMonitor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="volume_monitor_get_volumes"
-              c:identifier="g_volume_monitor_get_volumes">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="volume_monitor">
-          <type name="GVolumeMonitor" c:type="GVolumeMonitor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="volume_monitor_get_mounts"
-              c:identifier="g_volume_monitor_get_mounts">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="volume_monitor">
-          <type name="GVolumeMonitor" c:type="GVolumeMonitor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="volume_monitor_get_volume_for_uuid"
-              c:identifier="g_volume_monitor_get_volume_for_uuid">
-      <return-value>
-        <type name="GVolume" c:type="GVolume*"/>
-      </return-value>
-      <parameters>
-        <parameter name="volume_monitor">
-          <type name="GVolumeMonitor" c:type="GVolumeMonitor*"/>
-        </parameter>
-        <parameter name="uuid">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="volume_monitor_get_mount_for_uuid"
-              c:identifier="g_volume_monitor_get_mount_for_uuid">
-      <return-value>
-        <type name="GMount" c:type="GMount*"/>
-      </return-value>
-      <parameters>
-        <parameter name="volume_monitor">
-          <type name="GVolumeMonitor" c:type="GVolumeMonitor*"/>
-        </parameter>
-        <parameter name="uuid">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
+        </return-value>
+      </callback>
+      <callback name="et_connected_drives" c:type="get_connected_drives">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_volumes" c:type="get_volumes">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_mounts" c:type="get_mounts">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_volume_for_uuid" c:type="get_volume_for_uuid">
+        <return-value>
+          <type name="Volume" c:type="GVolume*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="uuid">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_mount_for_uuid" c:type="get_mount_for_uuid">
+        <return-value>
+          <type name="Mount" c:type="GMount*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="uuid">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="adopt_orphan_mount" c:type="adopt_orphan_mount">
+        <return-value>
+          <type name="Volume" c:type="GVolume*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved6" c:type="_g_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved7" c:type="_g_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved8" c:type="_g_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="volume-added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Volume" c:type="GVolume"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="volume-removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Volume" c:type="GVolume"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="volume-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Volume" c:type="GVolume"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mount-added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mount-removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mount-pre-unmount">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mount-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="drive-connected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Drive" c:type="GDrive"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="drive-disconnected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Drive" c:type="GDrive"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="drive-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Drive" c:type="GDrive"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
     <function name="volume_monitor_adopt_orphan_mount"
               c:identifier="g_volume_monitor_adopt_orphan_mount">
       <return-value>
-        <type name="GVolume" c:type="GVolume*"/>
+        <type name="Volume" c:type="GVolume*"/>
       </return-value>
       <parameters>
         <parameter name="mount">
-          <type name="GMount" c:type="GMount*"/>
+          <type name="Mount" c:type="GMount*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="ThemedIcon" c:type="GThemedIcon"/>
+    <class name="ThemedIcon"
+           c:type="GThemedIcon"
+           parent="Object"
+           glib:type-name="GThemedIcon"
+           glib:get-type="g_themed_icon_get_type">
+      <method name="append_name" c:identifier="g_themed_icon_append_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon">
+            <type name="ThemedIcon" c:type="GThemedIcon*"/>
+          </parameter>
+          <parameter name="iconname">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_names" c:identifier="g_themed_icon_get_names">
+        <return-value>
+          <type name="char" c:type="char**"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon">
+            <type name="ThemedIcon" c:type="GThemedIcon*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="names">
+        <type name="Strv" c:type="GStrv"/>
+      </property>
+      <property name="use-default-fallbacks">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
     <function name="themed_icon_new" c:identifier="g_themed_icon_new">
       <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
+        <type name="Icon" c:type="GIcon*"/>
       </return-value>
       <parameters>
         <parameter name="iconname">
@@ -8934,7 +10918,7 @@
     <function name="themed_icon_new_with_default_fallbacks"
               c:identifier="g_themed_icon_new_with_default_fallbacks">
       <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
+        <type name="Icon" c:type="GIcon*"/>
       </return-value>
       <parameters>
         <parameter name="iconname">
@@ -8945,7 +10929,7 @@
     <function name="themed_icon_new_from_names"
               c:identifier="g_themed_icon_new_from_names">
       <return-value>
-        <type name="GIcon" c:type="GIcon*"/>
+        <type name="Icon" c:type="GIcon*"/>
       </return-value>
       <parameters>
         <parameter name="iconnames">
@@ -8956,115 +10940,89 @@
         </parameter>
       </parameters>
     </function>
-    <function name="themed_icon_append_name"
-              c:identifier="g_themed_icon_append_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GThemedIcon" c:type="GThemedIcon*"/>
-        </parameter>
-        <parameter name="iconname">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="themed_icon_get_names"
-              c:identifier="g_themed_icon_get_names">
-      <return-value>
-        <type name="char" c:type="char**"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GThemedIcon" c:type="GThemedIcon*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="Seekable" c:type="GSeekable"/>
-    <interface name="GSeekable"
+    <interface name="Seekable"
                c:type="GSeekable"
                glib:type-name="GSeekable"
                glib:get-type="g_seekable_get_type">
-      <callback name="tell">
+      <callback name="tell" c:type="tell">
         <return-value>
-          <type name="goffset" c:type="goffset"/>
+          <type name="offset" c:type="goffset"/>
         </return-value>
         <parameters>
           <parameter name="seekable">
-            <type name="GSeekable" c:type="GSeekable*"/>
+            <type name="Seekable" c:type="GSeekable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_seek">
+      <callback name="can_seek" c:type="can_seek">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="seekable">
-            <type name="GSeekable" c:type="GSeekable*"/>
+            <type name="Seekable" c:type="GSeekable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="seek">
+      <callback name="seek" c:type="seek">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="seekable">
-            <type name="GSeekable" c:type="GSeekable*"/>
+            <type name="Seekable" c:type="GSeekable*"/>
           </parameter>
           <parameter name="offset">
-            <type name="goffset" c:type="goffset"/>
+            <type name="offset" c:type="goffset"/>
           </parameter>
           <parameter name="type">
-            <type name="GSeekType" c:type="GSeekType"/>
+            <type name="GLib.SeekType" c:type="GSeekType"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_truncate">
+      <callback name="can_truncate" c:type="can_truncate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="seekable">
-            <type name="GSeekable" c:type="GSeekable*"/>
+            <type name="Seekable" c:type="GSeekable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="truncate_fn">
+      <callback name="truncate_fn" c:type="truncate_fn">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="seekable">
-            <type name="GSeekable" c:type="GSeekable*"/>
+            <type name="Seekable" c:type="GSeekable*"/>
           </parameter>
           <parameter name="offset">
-            <type name="goffset" c:type="goffset"/>
+            <type name="offset" c:type="goffset"/>
           </parameter>
           <parameter name="cancellable">
-            <type name="GCancellable" c:type="GCancellable*"/>
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
     </interface>
     <function name="seekable_tell" c:identifier="g_seekable_tell">
       <return-value>
-        <type name="goffset" c:type="goffset"/>
+        <type name="offset" c:type="goffset"/>
       </return-value>
       <parameters>
         <parameter name="seekable">
-          <type name="GSeekable" c:type="GSeekable*"/>
+          <type name="Seekable" c:type="GSeekable*"/>
         </parameter>
       </parameters>
     </function>
@@ -9074,7 +11032,7 @@
       </return-value>
       <parameters>
         <parameter name="seekable">
-          <type name="GSeekable" c:type="GSeekable*"/>
+          <type name="Seekable" c:type="GSeekable*"/>
         </parameter>
       </parameters>
     </function>
@@ -9084,19 +11042,19 @@
       </return-value>
       <parameters>
         <parameter name="seekable">
-          <type name="GSeekable" c:type="GSeekable*"/>
+          <type name="Seekable" c:type="GSeekable*"/>
         </parameter>
         <parameter name="offset">
-          <type name="goffset" c:type="goffset"/>
+          <type name="offset" c:type="goffset"/>
         </parameter>
         <parameter name="type">
-          <type name="GSeekType" c:type="GSeekType"/>
+          <type name="GLib.SeekType" c:type="GSeekType"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -9107,7 +11065,7 @@
       </return-value>
       <parameters>
         <parameter name="seekable">
-          <type name="GSeekable" c:type="GSeekable*"/>
+          <type name="Seekable" c:type="GSeekable*"/>
         </parameter>
       </parameters>
     </function>
@@ -9117,25 +11075,26 @@
       </return-value>
       <parameters>
         <parameter name="seekable">
-          <type name="GSeekable" c:type="GSeekable*"/>
+          <type name="Seekable" c:type="GSeekable*"/>
         </parameter>
         <parameter name="offset">
-          <type name="goffset" c:type="goffset"/>
+          <type name="offset" c:type="goffset"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <record name="IOModule" c:type="GIOModule"/>
+    <record name="IOModuleClass" c:type="GIOModuleClass"/>
     <record name="IOExtensionPoint" c:type="GIOExtensionPoint"/>
     <record name="IOExtension" c:type="GIOExtension"/>
     <class name="Module"
            c:type="GIOModule"
-           parent="GTypeModule"
+           parent="TypeModule"
            glib:type-name="GIOModule"
            glib:get-type="g_io_module_get_type">
       <constructor name="new" c:identifier="g_io_module_new">
@@ -9172,7 +11131,7 @@
     <function name="io_modules_load_all_in_directory"
               c:identifier="g_io_modules_load_all_in_directory">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="dirname">
@@ -9183,7 +11142,7 @@
     <function name="io_extension_point_register"
               c:identifier="g_io_extension_point_register">
       <return-value>
-        <type name="GIOExtensionPoint" c:type="GIOExtensionPoint*"/>
+        <type name="ExtensionPoint" c:type="GIOExtensionPoint*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -9194,7 +11153,7 @@
     <function name="io_extension_point_lookup"
               c:identifier="g_io_extension_point_lookup">
       <return-value>
-        <type name="GIOExtensionPoint" c:type="GIOExtensionPoint*"/>
+        <type name="ExtensionPoint" c:type="GIOExtensionPoint*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -9209,43 +11168,43 @@
       </return-value>
       <parameters>
         <parameter name="extension_point">
-          <type name="GIOExtensionPoint" c:type="GIOExtensionPoint*"/>
+          <type name="ExtensionPoint" c:type="GIOExtensionPoint*"/>
         </parameter>
         <parameter name="type">
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_extension_point_get_required_type"
               c:identifier="g_io_extension_point_get_required_type">
       <return-value>
-        <type name="GObject.GType" c:type="GType"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
         <parameter name="extension_point">
-          <type name="GIOExtensionPoint" c:type="GIOExtensionPoint*"/>
+          <type name="ExtensionPoint" c:type="GIOExtensionPoint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_extension_point_get_extensions"
               c:identifier="g_io_extension_point_get_extensions">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="extension_point">
-          <type name="GIOExtensionPoint" c:type="GIOExtensionPoint*"/>
+          <type name="ExtensionPoint" c:type="GIOExtensionPoint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_extension_point_get_extension_by_name"
               c:identifier="g_io_extension_point_get_extension_by_name">
       <return-value>
-        <type name="GIOExtension" c:type="GIOExtension*"/>
+        <type name="Extension" c:type="GIOExtension*"/>
       </return-value>
       <parameters>
         <parameter name="extension_point">
-          <type name="GIOExtensionPoint" c:type="GIOExtensionPoint*"/>
+          <type name="ExtensionPoint" c:type="GIOExtensionPoint*"/>
         </parameter>
         <parameter name="name">
           <type name="string" c:type="char*"/>
@@ -9255,31 +11214,31 @@
     <function name="io_extension_point_implement"
               c:identifier="g_io_extension_point_implement">
       <return-value>
-        <type name="GIOExtension" c:type="GIOExtension*"/>
+        <type name="Extension" c:type="GIOExtension*"/>
       </return-value>
       <parameters>
         <parameter name="extension_point_name">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="type">
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="Type" c:type="GType"/>
         </parameter>
         <parameter name="extension_name">
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_extension_get_type"
               c:identifier="g_io_extension_get_type">
       <return-value>
-        <type name="GObject.GType" c:type="GType"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
         <parameter name="extension">
-          <type name="GIOExtension" c:type="GIOExtension*"/>
+          <type name="Extension" c:type="GIOExtension*"/>
         </parameter>
       </parameters>
     </function>
@@ -9290,43 +11249,43 @@
       </return-value>
       <parameters>
         <parameter name="extension">
-          <type name="GIOExtension" c:type="GIOExtension*"/>
+          <type name="Extension" c:type="GIOExtension*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_extension_get_priority"
               c:identifier="g_io_extension_get_priority">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="extension">
-          <type name="GIOExtension" c:type="GIOExtension*"/>
+          <type name="Extension" c:type="GIOExtension*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_extension_ref_class"
               c:identifier="g_io_extension_ref_class">
       <return-value>
-        <type name="GTypeClass" c:type="GTypeClass*"/>
+        <type name="GObject.TypeClass" c:type="GTypeClass*"/>
       </return-value>
       <parameters>
         <parameter name="extension">
-          <type name="GIOExtension" c:type="GIOExtension*"/>
+          <type name="Extension" c:type="GIOExtension*"/>
         </parameter>
       </parameters>
     </function>
     <record name="IOSchedulerJob" c:type="GIOSchedulerJob"/>
-    <callback name="GIOSchedulerJobFunc">
+    <callback name="SchedulerJobFunc" c:type="GIOSchedulerJobFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="job">
-          <type name="GIOSchedulerJob" c:type="GIOSchedulerJob*"/>
+          <type name="SchedulerJob" c:type="GIOSchedulerJob*"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -9340,19 +11299,19 @@
       </return-value>
       <parameters>
         <parameter name="job_func">
-          <type name="GIOSchedulerJobFunc" c:type="GIOSchedulerJobFunc"/>
+          <type name="SchedulerJobFunc" c:type="GIOSchedulerJobFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
       </parameters>
     </function>
@@ -9369,16 +11328,16 @@
       </return-value>
       <parameters>
         <parameter name="job">
-          <type name="GIOSchedulerJob" c:type="GIOSchedulerJob*"/>
+          <type name="SchedulerJob" c:type="GIOSchedulerJob*"/>
         </parameter>
         <parameter name="func">
-          <type name="GLib.GSourceFunc" c:type="GSourceFunc"/>
+          <type name="GLib.SourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -9389,54 +11348,83 @@
       </return-value>
       <parameters>
         <parameter name="job">
-          <type name="GIOSchedulerJob" c:type="GIOSchedulerJob*"/>
+          <type name="SchedulerJob" c:type="GIOSchedulerJob*"/>
         </parameter>
         <parameter name="func">
-          <type name="GLib.GSourceFunc" c:type="GSourceFunc"/>
+          <type name="GLib.SourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <record name="MemoryInputStream" c:type="GMemoryInputStream"/>
+    <class name="MemoryInputStream"
+           c:type="GMemoryInputStream"
+           parent="InputStream"
+           glib:type-name="GMemoryInputStream"
+           glib:get-type="g_memory_input_stream_get_type">
+      <method name="add_data" c:identifier="g_memory_input_stream_add_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="MemoryInputStream" c:type="GMemoryInputStream*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="ssize" c:type="gssize"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
     <record name="MemoryInputStreamPrivate"
             c:type="GMemoryInputStreamPrivate"/>
     <function name="memory_input_stream_new"
               c:identifier="g_memory_input_stream_new">
       <return-value>
-        <type name="GInputStream" c:type="GInputStream*"/>
+        <type name="InputStream" c:type="GInputStream*"/>
       </return-value>
     </function>
     <function name="memory_input_stream_new_from_data"
               c:identifier="g_memory_input_stream_new_from_data">
       <return-value>
-        <type name="GInputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="void*"/>
-        </parameter>
-        <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="memory_input_stream_add_data"
-              c:identifier="g_memory_input_stream_add_data">
-      <return-value>
-        <type name="none" c:type="void"/>
+        <type name="InputStream" c:type="GInputStream*"/>
       </return-value>
       <parameters>
-        <parameter name="stream">
-          <type name="GMemoryInputStream" c:type="GMemoryInputStream*"/>
-        </parameter>
         <parameter name="data">
           <type name="any" c:type="void*"/>
         </parameter>
@@ -9444,344 +11432,375 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <record name="MemoryOutputStream" c:type="GMemoryOutputStream"/>
-    <record name="MemoryOutputStreamPrivate"
-            c:type="GMemoryOutputStreamPrivate"/>
-    <callback name="GReallocFunc">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="memory_output_stream_new"
-              c:identifier="g_memory_output_stream_new">
-      <return-value>
-        <type name="GOutputStream" c:type="GOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
+    <class name="MemoryOutputStream"
+           c:type="GMemoryOutputStream"
+           parent="OutputStream"
+           glib:type-name="GMemoryOutputStream"
+           glib:get-type="g_memory_output_stream_get_type">
+      <method name="get_data" c:identifier="g_memory_output_stream_get_data">
+        <return-value>
           <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="len">
+        </return-value>
+        <parameters>
+          <parameter name="ostream">
+            <type name="MemoryOutputStream" c:type="GMemoryOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_size" c:identifier="g_memory_output_stream_get_size">
+        <return-value>
           <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="realloc_fn">
-          <type name="GReallocFunc" c:type="GReallocFunc"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="memory_output_stream_get_data"
-              c:identifier="g_memory_output_stream_get_data">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="ostream">
-          <type name="GMemoryOutputStream" c:type="GMemoryOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="memory_output_stream_get_size"
-              c:identifier="g_memory_output_stream_get_size">
-      <return-value>
-        <type name="size" c:type="gsize"/>
-      </return-value>
-      <parameters>
-        <parameter name="ostream">
-          <type name="GMemoryOutputStream" c:type="GMemoryOutputStream*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="SimpleAsyncResult" c:type="GSimpleAsyncResult"/>
-    <callback name="GSimpleAsyncThreadFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="res">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="object">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="simple_async_result_new"
-              c:identifier="g_simple_async_result_new">
-      <return-value>
-        <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-      </return-value>
-      <parameters>
-        <parameter name="source_object">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="source_tag">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_new_error"
-              c:identifier="g_simple_async_result_new_error">
-      <return-value>
-        <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-      </return-value>
-      <parameters>
-        <parameter name="source_object">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="domain">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="code">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="format">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_new_from_error"
-              c:identifier="g_simple_async_result_new_from_error">
-      <return-value>
-        <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-      </return-value>
-      <parameters>
-        <parameter name="source_object">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_set_op_res_gpointer"
-              c:identifier="g_simple_async_result_set_op_res_gpointer">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="op_res">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy_op_res">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_get_op_res_gpointer"
-              c:identifier="g_simple_async_result_get_op_res_gpointer">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_set_op_res_gssize"
-              c:identifier="g_simple_async_result_set_op_res_gssize">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="op_res">
-          <type name="ssize" c:type="gssize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_get_op_res_gssize"
-              c:identifier="g_simple_async_result_get_op_res_gssize">
-      <return-value>
-        <type name="ssize" c:type="gssize"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_set_op_res_gboolean"
-              c:identifier="g_simple_async_result_set_op_res_gboolean">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="op_res">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_get_op_res_gboolean"
-              c:identifier="g_simple_async_result_get_op_res_gboolean">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_get_source_tag"
-              c:identifier="g_simple_async_result_get_source_tag">
+        </return-value>
+        <parameters>
+          <parameter name="ostream">
+            <type name="MemoryOutputStream" c:type="GMemoryOutputStream*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="g_reserved1" c:type="_g_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="MemoryOutputStreamPrivate"
+            c:type="GMemoryOutputStreamPrivate"/>
+    <callback name="ReallocFunc" c:type="GReallocFunc">
       <return-value>
         <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_set_handle_cancellation"
-              c:identifier="g_simple_async_result_set_handle_cancellation">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="handle_cancellation">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_complete"
-              c:identifier="g_simple_async_result_complete">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_complete_in_idle"
-              c:identifier="g_simple_async_result_complete_in_idle">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+        <parameter name="size">
+          <type name="size" c:type="gsize"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="simple_async_result_run_in_thread"
-              c:identifier="g_simple_async_result_run_in_thread">
+    </callback>
+    <function name="memory_output_stream_new"
+              c:identifier="g_memory_output_stream_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="OutputStream" c:type="GOutputStream*"/>
       </return-value>
       <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="func">
-          <type name="GSimpleAsyncThreadFunc" c:type="GSimpleAsyncThreadFunc"/>
+        <parameter name="len">
+          <type name="size" c:type="gsize"/>
         </parameter>
-        <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+        <parameter name="realloc_fn">
+          <type name="ReallocFunc" c:type="GReallocFunc"/>
         </parameter>
-        <parameter name="cancellable">
-          <type name="GCancellable" c:type="GCancellable*"/>
+        <parameter name="destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="simple_async_result_set_from_error"
+    <class name="SimpleAsyncResult"
+           c:type="GSimpleAsyncResult"
+           parent="Object"
+           glib:type-name="GSimpleAsyncResult"
+           glib:get-type="g_simple_async_result_get_type">
+      <constructor name="new" c:identifier="g_simple_async_result_new">
+        <return-value>
+          <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+        </return-value>
+        <parameters>
+          <parameter name="source_object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="source_tag">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_error"
+                   c:identifier="g_simple_async_result_new_error">
+        <return-value>
+          <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+        </return-value>
+        <parameters>
+          <parameter name="source_object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="domain">
+            <type name="Quark" c:type="GQuark"/>
+          </parameter>
+          <parameter name="code">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="format">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_error"
+                   c:identifier="g_simple_async_result_new_from_error">
+        <return-value>
+          <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+        </return-value>
+        <parameters>
+          <parameter name="source_object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_op_res_gpointer"
+              c:identifier="g_simple_async_result_set_op_res_gpointer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="op_res">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy_op_res">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_op_res_gpointer"
+              c:identifier="g_simple_async_result_get_op_res_gpointer">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_op_res_gssize"
+              c:identifier="g_simple_async_result_set_op_res_gssize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="op_res">
+            <type name="ssize" c:type="gssize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_op_res_gssize"
+              c:identifier="g_simple_async_result_get_op_res_gssize">
+        <return-value>
+          <type name="ssize" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_op_res_gboolean"
+              c:identifier="g_simple_async_result_set_op_res_gboolean">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="op_res">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_op_res_gboolean"
+              c:identifier="g_simple_async_result_get_op_res_gboolean">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_source_tag"
+              c:identifier="g_simple_async_result_get_source_tag">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_handle_cancellation"
+              c:identifier="g_simple_async_result_set_handle_cancellation">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="handle_cancellation">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="complete" c:identifier="g_simple_async_result_complete">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="complete_in_idle"
+              c:identifier="g_simple_async_result_complete_in_idle">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="run_in_thread"
+              c:identifier="g_simple_async_result_run_in_thread">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="SimpleAsyncThreadFunc"
+                  c:type="GSimpleAsyncThreadFunc"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_from_error"
               c:identifier="g_simple_async_result_set_from_error">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_propagate_error"
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="propagate_error"
               c:identifier="g_simple_async_result_propagate_error">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="dest">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="simple_async_result_set_error"
-              c:identifier="g_simple_async_result_set_error">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="dest">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_error" c:identifier="g_simple_async_result_set_error">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="simple">
+            <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
+          </parameter>
+          <parameter name="domain">
+            <type name="Quark" c:type="GQuark"/>
+          </parameter>
+          <parameter name="code">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="format">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <callback name="SimpleAsyncThreadFunc" c:type="GSimpleAsyncThreadFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="simple">
-          <type name="GSimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
-        </parameter>
-        <parameter name="domain">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="res">
+          <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
         </parameter>
-        <parameter name="code">
-          <type name="int32" c:type="gint"/>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="format">
-          <type name="string" c:type="char*"/>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
       </parameters>
-    </function>
+    </callback>
     <function name="simple_async_report_error_in_idle"
               c:identifier="g_simple_async_report_error_in_idle">
       <return-value>
@@ -9789,19 +11808,19 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject.Object" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="domain">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="code">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="char*"/>
@@ -9815,19 +11834,38 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject.Object" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="callback">
-          <type name="GAsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError*"/>
+          <type name="GLib.Error" c:type="GError*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="NativeVolumeMonitor" c:type="GNativeVolumeMonitor"/>
+    <class name="NativeVolumeMonitor"
+           c:type="GNativeVolumeMonitor"
+           parent="VolumeMonitor"
+           glib:type-name="GNativeVolumeMonitor"
+           glib:get-type="g_native_volume_monitor_get_type">
+      <callback name="et_mount_for_mount_path"
+                c:type="get_mount_for_mount_path">
+        <return-value>
+          <type name="Mount" c:type="GMount*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mount_path">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </class>
   </namespace>
 </repository>

Modified: trunk/gir/glib-2.0-good.gir
==============================================================================
--- trunk/gir/glib-2.0-good.gir	(original)
+++ trunk/gir/glib-2.0-good.gir	Mon Aug 18 20:43:48 2008
@@ -3,29 +3,31 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="GLib">
-    <alias name="gchar" target="char"/>
-    <alias name="gshort" target="short"/>
-    <alias name="glong" target="long"/>
-    <alias name="gint" target="int"/>
-    <alias name="gboolean" target="gint"/>
-    <alias name="guchar" target="unsigned"/>
-    <alias name="gushort" target="unsigned"/>
-    <alias name="gulong" target="unsigned"/>
-    <alias name="guint" target="unsigned"/>
-    <alias name="gfloat" target="float"/>
-    <alias name="gdouble" target="double"/>
-    <alias name="GDoubleIEEE754" target="_GDoubleIEEE754"/>
-    <alias name="GFloatIEEE754" target="_GFloatIEEE754"/>
-    <alias name="GQuark" target="guint32"/>
-    <alias name="GTime" target="gint32"/>
-    <alias name="GDateYear" target="guint16"/>
-    <alias name="GDateDay" target="guint8"/>
-    <alias name="gunichar" target="guint32"/>
-    <alias name="gunichar2" target="guint16"/>
-    <alias name="GTokenValue" target="_GTokenValue"/>
-    <callback name="GCompareFunc">
+    <alias name="char" target="char" c:type="gchar"/>
+    <alias name="short" target="short" c:type="gshort"/>
+    <alias name="long" target="long" c:type="glong"/>
+    <alias name="int" target="int" c:type="gint"/>
+    <alias name="boolean" target="int" c:type="gboolean"/>
+    <alias name="uchar" target="unsigned" c:type="guchar"/>
+    <alias name="ushort" target="unsigned" c:type="gushort"/>
+    <alias name="ulong" target="unsigned" c:type="gulong"/>
+    <alias name="uint" target="unsigned" c:type="guint"/>
+    <alias name="float" target="float" c:type="gfloat"/>
+    <alias name="double" target="double" c:type="gdouble"/>
+    <alias name="DoubleIEEE754"
+           target="DoubleIEEE754"
+           c:type="GDoubleIEEE754"/>
+    <alias name="FloatIEEE754" target="FloatIEEE754" c:type="GFloatIEEE754"/>
+    <alias name="Quark" target="uint32" c:type="GQuark"/>
+    <alias name="Time" target="int32" c:type="GTime"/>
+    <alias name="DateYear" target="uint16" c:type="GDateYear"/>
+    <alias name="DateDay" target="uint8" c:type="GDateDay"/>
+    <alias name="unichar" target="uint32" c:type="gunichar"/>
+    <alias name="unichar2" target="uint16" c:type="gunichar2"/>
+    <alias name="TokenValue" target="TokenValue" c:type="GTokenValue"/>
+    <callback name="CompareFunc" c:type="GCompareFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="a">
@@ -36,9 +38,9 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GCompareDataFunc">
+    <callback name="CompareDataFunc" c:type="GCompareDataFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="a">
@@ -52,7 +54,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GEqualFunc">
+    <callback name="EqualFunc" c:type="GEqualFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -65,7 +67,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GDestroyNotify">
+    <callback name="DestroyNotify" c:type="GDestroyNotify">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -75,7 +77,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GFunc">
+    <callback name="Func" c:type="GFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -88,9 +90,9 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHashFunc">
+    <callback name="HashFunc" c:type="GHashFunc">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="key">
@@ -98,7 +100,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHFunc">
+    <callback name="HFunc" c:type="GHFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -114,7 +116,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GFreeFunc">
+    <callback name="FreeFunc" c:type="GFreeFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -124,7 +126,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GTranslateFunc">
+    <callback name="TranslateFunc" c:type="GTranslateFunc">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -137,8 +139,7 @@
         </parameter>
       </parameters>
     </callback>
-    <record name="TimeVal" c:type="GTimeVal"/>
-    <record name="GTimeVal" c:type="_GTimeVal">
+    <record name="TimeVal" c:type="GTimeVal">
       <field name="tv_sec">
         <type name="long" c:type="glong"/>
       </field>
@@ -146,36 +147,33 @@
         <type name="long" c:type="glong"/>
       </field>
     </record>
-    <record name="Array" c:type="GArray"/>
-    <record name="ByteArray" c:type="GByteArray"/>
-    <record name="PtrArray" c:type="GPtrArray"/>
-    <record name="GArray" c:type="_GArray">
+    <record name="Array" c:type="GArray">
       <field name="data">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="len">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
-    <record name="GByteArray" c:type="_GByteArray">
+    <record name="ByteArray" c:type="GByteArray">
       <field name="data">
-        <type name="guint8" c:type="guint8*"/>
+        <type name="uint8" c:type="guint8*"/>
       </field>
       <field name="len">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
-    <record name="GPtrArray" c:type="_GPtrArray">
+    <record name="PtrArray" c:type="GPtrArray">
       <field name="pdata">
-        <type name="gpointer" c:type="gpointer*"/>
+        <type name="pointer" c:type="gpointer*"/>
       </field>
       <field name="len">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
     <function name="array_new" c:identifier="g_array_new">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="zero_terminated">
@@ -185,13 +183,13 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="element_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="array_sized_new" c:identifier="g_array_sized_new">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="zero_terminated">
@@ -201,10 +199,10 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="element_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="reserved_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -214,7 +212,7 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="free_segment">
           <type name="boolean" c:type="gboolean"/>
@@ -223,108 +221,108 @@
     </function>
     <function name="array_append_vals" c:identifier="g_array_append_vals">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="len">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="array_prepend_vals" c:identifier="g_array_prepend_vals">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="len">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="array_insert_vals" c:identifier="g_array_insert_vals">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="len">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="array_set_size" c:identifier="g_array_set_size">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="array_remove_index" c:identifier="g_array_remove_index">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="array_remove_index_fast"
               c:identifier="g_array_remove_index_fast">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="array_remove_range" c:identifier="g_array_remove_range">
       <return-value>
-        <type name="GArray" c:type="GArray*"/>
+        <type name="Array" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -334,10 +332,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -348,10 +346,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GArray" c:type="GArray*"/>
+          <type name="Array" c:type="GArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -360,26 +358,26 @@
     </function>
     <function name="ptr_array_new" c:identifier="g_ptr_array_new">
       <return-value>
-        <type name="GPtrArray" c:type="GPtrArray*"/>
+        <type name="PtrArray" c:type="GPtrArray*"/>
       </return-value>
     </function>
     <function name="ptr_array_sized_new" c:identifier="g_ptr_array_sized_new">
       <return-value>
-        <type name="GPtrArray" c:type="GPtrArray*"/>
+        <type name="PtrArray" c:type="GPtrArray*"/>
       </return-value>
       <parameters>
         <parameter name="reserved_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="ptr_array_free" c:identifier="g_ptr_array_free">
       <return-value>
-        <type name="gpointer" c:type="gpointer*"/>
+        <type name="pointer" c:type="gpointer*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="free_seg">
           <type name="boolean" c:type="gboolean"/>
@@ -392,10 +390,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -406,10 +404,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -420,10 +418,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -433,7 +431,7 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -447,7 +445,7 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -461,13 +459,13 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -477,7 +475,7 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -490,10 +488,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -504,10 +502,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -520,10 +518,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="PtrArray" c:type="GPtrArray*"/>
         </parameter>
         <parameter name="func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -532,27 +530,27 @@
     </function>
     <function name="byte_array_new" c:identifier="g_byte_array_new">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
     </function>
     <function name="byte_array_sized_new"
               c:identifier="g_byte_array_sized_new">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="reserved_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="byte_array_free" c:identifier="g_byte_array_free">
       <return-value>
-        <type name="guint8" c:type="guint8*"/>
+        <type name="uint8" c:type="guint8*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="free_segment">
           <type name="boolean" c:type="gboolean"/>
@@ -561,91 +559,91 @@
     </function>
     <function name="byte_array_append" c:identifier="g_byte_array_append">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="data">
-          <type name="guint8" c:type="guint8*"/>
+          <type name="uint8" c:type="guint8*"/>
         </parameter>
         <parameter name="len">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="byte_array_prepend" c:identifier="g_byte_array_prepend">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="data">
-          <type name="guint8" c:type="guint8*"/>
+          <type name="uint8" c:type="guint8*"/>
         </parameter>
         <parameter name="len">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="byte_array_set_size" c:identifier="g_byte_array_set_size">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="byte_array_remove_index"
               c:identifier="g_byte_array_remove_index">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="byte_array_remove_index_fast"
               c:identifier="g_byte_array_remove_index_fast">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="byte_array_remove_range"
               c:identifier="g_byte_array_remove_range">
       <return-value>
-        <type name="GByteArray" c:type="GByteArray*"/>
+        <type name="ByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -655,10 +653,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -669,10 +667,10 @@
       </return-value>
       <parameters>
         <parameter name="array">
-          <type name="GByteArray" c:type="GByteArray*"/>
+          <type name="ByteArray" c:type="GByteArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -681,7 +679,7 @@
     </function>
     <function name="quark_try_string" c:identifier="g_quark_try_string">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -692,7 +690,7 @@
     <function name="quark_from_static_string"
               c:identifier="g_quark_from_static_string">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -702,7 +700,7 @@
     </function>
     <function name="quark_from_string" c:identifier="g_quark_from_string">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -716,7 +714,7 @@
       </return-value>
       <parameters>
         <parameter name="quark">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -741,13 +739,12 @@
         </parameter>
       </parameters>
     </function>
-    <record name="Error" c:type="GError"/>
-    <record name="GError" c:type="_GError">
+    <record name="Error" c:type="GError">
       <field name="domain">
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </field>
       <field name="code">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </field>
       <field name="message">
         <type name="string" c:type="gchar*"/>
@@ -755,14 +752,14 @@
     </record>
     <function name="error_new" c:identifier="g_error_new">
       <return-value>
-        <type name="GError" c:type="GError*"/>
+        <type name="Error" c:type="GError*"/>
       </return-value>
       <parameters>
         <parameter name="domain">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="code">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -771,14 +768,14 @@
     </function>
     <function name="error_new_literal" c:identifier="g_error_new_literal">
       <return-value>
-        <type name="GError" c:type="GError*"/>
+        <type name="Error" c:type="GError*"/>
       </return-value>
       <parameters>
         <parameter name="domain">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="code">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="message">
           <type name="string" c:type="gchar*"/>
@@ -791,17 +788,17 @@
       </return-value>
       <parameters>
         <parameter name="error">
-          <type name="GError" c:type="GError*"/>
+          <type name="Error" c:type="GError*"/>
         </parameter>
       </parameters>
     </function>
     <function name="error_copy" c:identifier="g_error_copy">
       <return-value>
-        <type name="GError" c:type="GError*"/>
+        <type name="Error" c:type="GError*"/>
       </return-value>
       <parameters>
         <parameter name="error">
-          <type name="GError" c:type="GError*"/>
+          <type name="Error" c:type="GError*"/>
         </parameter>
       </parameters>
     </function>
@@ -811,13 +808,13 @@
       </return-value>
       <parameters>
         <parameter name="error">
-          <type name="GError" c:type="GError*"/>
+          <type name="Error" c:type="GError*"/>
         </parameter>
         <parameter name="domain">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="code">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -827,13 +824,13 @@
       </return-value>
       <parameters>
         <parameter name="err">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
         <parameter name="domain">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="code">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -846,10 +843,10 @@
       </return-value>
       <parameters>
         <parameter name="dest">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
         <parameter name="src">
-          <type name="GError" c:type="GError*"/>
+          <type name="Error" c:type="GError*"/>
         </parameter>
       </parameters>
     </function>
@@ -859,7 +856,7 @@
       </return-value>
       <parameters>
         <parameter name="err">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -869,7 +866,7 @@
       </return-value>
       <parameters>
         <parameter name="err">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -883,42 +880,42 @@
       </return-value>
       <parameters>
         <parameter name="dest">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
         <parameter name="src">
-          <type name="GError" c:type="GError*"/>
+          <type name="Error" c:type="GError*"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="get_user_name" c:identifier="g_get_user_name">
+    <function name="et_user_name" c:identifier="g_get_user_name">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_real_name" c:identifier="g_get_real_name">
+    <function name="et_real_name" c:identifier="g_get_real_name">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_home_dir" c:identifier="g_get_home_dir">
+    <function name="et_home_dir" c:identifier="g_get_home_dir">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_tmp_dir" c:identifier="g_get_tmp_dir">
+    <function name="et_tmp_dir" c:identifier="g_get_tmp_dir">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_host_name" c:identifier="g_get_host_name">
+    <function name="et_host_name" c:identifier="g_get_host_name">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_prgname" c:identifier="g_get_prgname">
+    <function name="et_prgname" c:identifier="g_get_prgname">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -933,8 +930,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="get_application_name"
-              c:identifier="g_get_application_name">
+    <function name="et_application_name" c:identifier="g_get_application_name">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -950,104 +946,99 @@
         </parameter>
       </parameters>
     </function>
-    <function name="get_user_data_dir" c:identifier="g_get_user_data_dir">
+    <function name="et_user_data_dir" c:identifier="g_get_user_data_dir">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_user_config_dir" c:identifier="g_get_user_config_dir">
+    <function name="et_user_config_dir" c:identifier="g_get_user_config_dir">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_user_cache_dir" c:identifier="g_get_user_cache_dir">
+    <function name="et_user_cache_dir" c:identifier="g_get_user_cache_dir">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <function name="get_system_data_dirs"
-              c:identifier="g_get_system_data_dirs">
+    <function name="et_system_data_dirs" c:identifier="g_get_system_data_dirs">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
     </function>
-    <function name="get_system_config_dirs"
+    <function name="et_system_config_dirs"
               c:identifier="g_get_system_config_dirs">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
     </function>
-    <function name="get_language_names" c:identifier="g_get_language_names">
+    <function name="et_language_names" c:identifier="g_get_language_names">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
     </function>
-    <enumeration name="GUserDirectory" c:type="GUserDirectory">
-      <member name="y_desktop"
+    <enumeration name="UserDirectory" c:type="GUserDirectory">
+      <member name="ydesktop"
               value="0"
               c:identifier="G_USER_DIRECTORY_DESKTOP"/>
-      <member name="y_documents"
+      <member name="ydocuments"
               value="1"
               c:identifier="G_USER_DIRECTORY_DOCUMENTS"/>
-      <member name="y_download"
+      <member name="ydownload"
               value="2"
               c:identifier="G_USER_DIRECTORY_DOWNLOAD"/>
-      <member name="y_music" value="3" c:identifier="G_USER_DIRECTORY_MUSIC"/>
-      <member name="y_pictures"
+      <member name="ymusic" value="3" c:identifier="G_USER_DIRECTORY_MUSIC"/>
+      <member name="ypictures"
               value="4"
               c:identifier="G_USER_DIRECTORY_PICTURES"/>
-      <member name="y_public_share"
+      <member name="ypublicshare"
               value="5"
               c:identifier="G_USER_DIRECTORY_PUBLIC_SHARE"/>
-      <member name="y_templates"
+      <member name="ytemplates"
               value="6"
               c:identifier="G_USER_DIRECTORY_TEMPLATES"/>
-      <member name="y_videos"
-              value="7"
-              c:identifier="G_USER_DIRECTORY_VIDEOS"/>
-      <member name="n_directories"
+      <member name="yvideos" value="7" c:identifier="G_USER_DIRECTORY_VIDEOS"/>
+      <member name="ndirectories"
               value="8"
               c:identifier="G_USER_N_DIRECTORIES"/>
     </enumeration>
-    <function name="get_user_special_dir"
-              c:identifier="g_get_user_special_dir">
+    <function name="et_user_special_dir" c:identifier="g_get_user_special_dir">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="directory">
-          <type name="GUserDirectory" c:type="GUserDirectory"/>
+          <type name="UserDirectory" c:type="GUserDirectory"/>
         </parameter>
       </parameters>
     </function>
-    <record name="DebugKey" c:type="GDebugKey"/>
-    <record name="GDebugKey" c:type="_GDebugKey">
+    <record name="DebugKey" c:type="GDebugKey">
       <field name="key">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="value">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
     <function name="parse_debug_string" c:identifier="g_parse_debug_string">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="keys">
-          <type name="GDebugKey" c:type="GDebugKey*"/>
+          <type name="DebugKey" c:type="GDebugKey*"/>
         </parameter>
         <parameter name="nkeys">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="snprintf" c:identifier="g_snprintf">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -1091,7 +1082,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="get_current_dir" c:identifier="g_get_current_dir">
+    <function name="et_current_dir" c:identifier="g_get_current_dir">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -1122,11 +1113,11 @@
       </return-value>
       <parameters>
         <parameter name="nullify_location">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="getenv" c:identifier="g_getenv">
+    <function name="etenv" c:identifier="g_getenv">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -1164,10 +1155,10 @@
     </function>
     <function name="listenv" c:identifier="g_listenv">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
     </function>
-    <function name="g_getenv_nomalloc" c:identifier="_g_getenv_nomalloc">
+    <function name="getenv_nomalloc" c:identifier="_g_getenv_nomalloc">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -1176,11 +1167,11 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="buffer">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GVoidFunc">
+    <callback name="VoidFunc" c:type="GVoidFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -1191,7 +1182,7 @@
       </return-value>
       <parameters>
         <parameter name="func">
-          <type name="GVoidFunc" c:type="GVoidFunc"/>
+          <type name="VoidFunc" c:type="GVoidFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -1208,33 +1199,33 @@
     </function>
     <function name="bit_nth_lsf" c:identifier="g_bit_nth_lsf">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="mask">
           <type name="ulong" c:type="gulong"/>
         </parameter>
         <parameter name="nth_bit">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="bit_nth_msf" c:identifier="g_bit_nth_msf">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="mask">
           <type name="ulong" c:type="gulong"/>
         </parameter>
         <parameter name="nth_bit">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="bit_storage" c:identifier="g_bit_storage">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="number">
@@ -1242,10 +1233,9 @@
         </parameter>
       </parameters>
     </function>
-    <record name="TrashStack" c:type="GTrashStack"/>
-    <record name="GTrashStack" c:type="_GTrashStack">
+    <record name="TrashStack" c:type="GTrashStack">
       <field name="next">
-        <type name="GTrashStack" c:type="GTrashStack*"/>
+        <type name="TrashStack" c:type="GTrashStack*"/>
       </field>
     </record>
     <function name="trash_stack_push" c:identifier="g_trash_stack_push">
@@ -1254,7 +1244,7 @@
       </return-value>
       <parameters>
         <parameter name="stack_p">
-          <type name="GTrashStack" c:type="GTrashStack**"/>
+          <type name="TrashStack" c:type="GTrashStack**"/>
         </parameter>
         <parameter name="data_p">
           <type name="any" c:type="gpointer"/>
@@ -1267,7 +1257,7 @@
       </return-value>
       <parameters>
         <parameter name="stack_p">
-          <type name="GTrashStack" c:type="GTrashStack**"/>
+          <type name="TrashStack" c:type="GTrashStack**"/>
         </parameter>
       </parameters>
     </function>
@@ -1277,17 +1267,17 @@
       </return-value>
       <parameters>
         <parameter name="stack_p">
-          <type name="GTrashStack" c:type="GTrashStack**"/>
+          <type name="TrashStack" c:type="GTrashStack**"/>
         </parameter>
       </parameters>
     </function>
     <function name="trash_stack_height" c:identifier="g_trash_stack_height">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="stack_p">
-          <type name="GTrashStack" c:type="GTrashStack**"/>
+          <type name="TrashStack" c:type="GTrashStack**"/>
         </parameter>
       </parameters>
     </function>
@@ -1297,27 +1287,27 @@
       </return-value>
       <parameters>
         <parameter name="required_major">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="required_minor">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="required_micro">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="atomic_int_exchange_and_add"
               c:identifier="g_atomic_int_exchange_and_add">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="val">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -1327,10 +1317,10 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="val">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -1341,13 +1331,13 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="oldval">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="newval">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -1358,7 +1348,7 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
         <parameter name="oldval">
           <type name="any" c:type="gpointer"/>
@@ -1370,11 +1360,11 @@
     </function>
     <function name="atomic_int_get" c:identifier="g_atomic_int_get">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -1384,10 +1374,10 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="newval">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -1397,7 +1387,7 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -1407,7 +1397,7 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
         <parameter name="newval">
           <type name="any" c:type="gpointer"/>
@@ -1416,13 +1406,13 @@
     </function>
     <function name="thread_error_quark" c:identifier="g_thread_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
-    <enumeration name="GThreadError" c:type="GThreadError">
-      <member name="r_again" value="0" c:identifier="G_THREAD_ERROR_AGAIN"/>
+    <enumeration name="ThreadError" c:type="GThreadError">
+      <member name="ragain" value="0" c:identifier="G_THREAD_ERROR_AGAIN"/>
     </enumeration>
-    <callback name="GThreadFunc">
+    <callback name="ThreadFunc" c:type="GThreadFunc">
       <return-value>
         <type name="any" c:type="gpointer"/>
       </return-value>
@@ -1432,20 +1422,19 @@
         </parameter>
       </parameters>
     </callback>
-    <enumeration name="GThreadPriority" c:type="GThreadPriority">
-      <member name="y_low" value="0" c:identifier="G_THREAD_PRIORITY_LOW"/>
-      <member name="y_normal"
+    <enumeration name="ThreadPriority" c:type="GThreadPriority">
+      <member name="ylow" value="0" c:identifier="G_THREAD_PRIORITY_LOW"/>
+      <member name="ynormal"
               value="1"
               c:identifier="G_THREAD_PRIORITY_NORMAL"/>
-      <member name="y_high" value="2" c:identifier="G_THREAD_PRIORITY_HIGH"/>
-      <member name="y_urgent"
+      <member name="yhigh" value="2" c:identifier="G_THREAD_PRIORITY_HIGH"/>
+      <member name="yurgent"
               value="3"
               c:identifier="G_THREAD_PRIORITY_URGENT"/>
     </enumeration>
-    <record name="Thread" c:type="GThread"/>
-    <record name="GThread" c:type="_GThread">
+    <record name="Thread" c:type="GThread">
       <field name="func">
-        <type name="GThreadFunc" c:type="GThreadFunc"/>
+        <type name="ThreadFunc" c:type="GThreadFunc"/>
       </field>
       <field name="data">
         <type name="any" c:type="gpointer"/>
@@ -1454,164 +1443,167 @@
         <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="priority">
-        <type name="GThreadPriority" c:type="GThreadPriority"/>
+        <type name="ThreadPriority" c:type="GThreadPriority"/>
       </field>
     </record>
     <record name="Mutex" c:type="GMutex"/>
     <record name="Cond" c:type="GCond"/>
     <record name="Private" c:type="GPrivate"/>
-    <record name="StaticPrivate" c:type="GStaticPrivate"/>
-    <record name="ThreadFunctions" c:type="GThreadFunctions"/>
-    <record name="GThreadFunctions" c:type="_GThreadFunctions">
-      <callback name="mutex_new">
+    <record name="StaticPrivate" c:type="GStaticPrivate">
+      <field name="index">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="ThreadFunctions" c:type="GThreadFunctions">
+      <callback name="mutex_new" c:type="mutex_new">
         <return-value>
-          <type name="GMutex" c:type="GMutex*"/>
+          <type name="Mutex" c:type="GMutex*"/>
         </return-value>
       </callback>
-      <callback name="mutex_lock">
+      <callback name="mutex_lock" c:type="mutex_lock">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex" c:type="GMutex*"/>
+            <type name="Mutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="mutex_trylock">
+      <callback name="mutex_trylock" c:type="mutex_trylock">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex" c:type="GMutex*"/>
+            <type name="Mutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="mutex_unlock">
+      <callback name="mutex_unlock" c:type="mutex_unlock">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex" c:type="GMutex*"/>
+            <type name="Mutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="mutex_free">
+      <callback name="mutex_free" c:type="mutex_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex" c:type="GMutex*"/>
+            <type name="Mutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cond_new">
+      <callback name="cond_new" c:type="cond_new">
         <return-value>
-          <type name="GCond" c:type="GCond*"/>
+          <type name="Cond" c:type="GCond*"/>
         </return-value>
       </callback>
-      <callback name="cond_signal">
+      <callback name="cond_signal" c:type="cond_signal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond" c:type="GCond*"/>
+            <type name="Cond" c:type="GCond*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cond_broadcast">
+      <callback name="cond_broadcast" c:type="cond_broadcast">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond" c:type="GCond*"/>
+            <type name="Cond" c:type="GCond*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cond_wait">
+      <callback name="cond_wait" c:type="cond_wait">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond" c:type="GCond*"/>
+            <type name="Cond" c:type="GCond*"/>
           </parameter>
           <parameter name="mutex">
-            <type name="GMutex" c:type="GMutex*"/>
+            <type name="Mutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cond_timed_wait">
+      <callback name="cond_timed_wait" c:type="cond_timed_wait">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond" c:type="GCond*"/>
+            <type name="Cond" c:type="GCond*"/>
           </parameter>
           <parameter name="mutex">
-            <type name="GMutex" c:type="GMutex*"/>
+            <type name="Mutex" c:type="GMutex*"/>
           </parameter>
           <parameter name="end_time">
-            <type name="GTimeVal" c:type="GTimeVal*"/>
+            <type name="TimeVal" c:type="GTimeVal*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cond_free">
+      <callback name="cond_free" c:type="cond_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond" c:type="GCond*"/>
+            <type name="Cond" c:type="GCond*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="private_new">
+      <callback name="private_new" c:type="private_new">
         <return-value>
-          <type name="GPrivate" c:type="GPrivate*"/>
+          <type name="Private" c:type="GPrivate*"/>
         </return-value>
         <parameters>
           <parameter name="destructor">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="private_get">
+      <callback name="private_get" c:type="private_get">
         <return-value>
           <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
           <parameter name="private_key">
-            <type name="GPrivate" c:type="GPrivate*"/>
+            <type name="Private" c:type="GPrivate*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="private_set">
+      <callback name="private_set" c:type="private_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="private_key">
-            <type name="GPrivate" c:type="GPrivate*"/>
+            <type name="Private" c:type="GPrivate*"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="thread_create">
+      <callback name="thread_create" c:type="thread_create">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="func">
-            <type name="GThreadFunc" c:type="GThreadFunc"/>
+            <type name="ThreadFunc" c:type="GThreadFunc"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
@@ -1626,22 +1618,22 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="priority">
-            <type name="GThreadPriority" c:type="GThreadPriority"/>
+            <type name="ThreadPriority" c:type="GThreadPriority"/>
           </parameter>
           <parameter name="thread">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="thread_yield">
+      <callback name="thread_yield" c:type="thread_yield">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="thread_join">
+      <callback name="thread_join" c:type="thread_join">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1651,12 +1643,12 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="thread_exit">
+      <callback name="thread_exit" c:type="thread_exit">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="thread_set_priority">
+      <callback name="thread_set_priority" c:type="thread_set_priority">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1665,11 +1657,11 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="priority">
-            <type name="GThreadPriority" c:type="GThreadPriority"/>
+            <type name="ThreadPriority" c:type="GThreadPriority"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="thread_self">
+      <callback name="thread_self" c:type="thread_self">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1679,7 +1671,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="thread_equal">
+      <callback name="thread_equal" c:type="thread_equal">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -1699,7 +1691,7 @@
       </return-value>
       <parameters>
         <parameter name="vtable">
-          <type name="GThreadFunctions" c:type="GThreadFunctions*"/>
+          <type name="ThreadFunctions" c:type="GThreadFunctions*"/>
         </parameter>
       </parameters>
     </function>
@@ -1710,28 +1702,28 @@
       </return-value>
       <parameters>
         <parameter name="vtable">
-          <type name="GThreadFunctions" c:type="GThreadFunctions*"/>
+          <type name="ThreadFunctions" c:type="GThreadFunctions*"/>
         </parameter>
       </parameters>
     </function>
     <function name="static_mutex_get_mutex_impl"
               c:identifier="g_static_mutex_get_mutex_impl">
       <return-value>
-        <type name="GMutex" c:type="GMutex*"/>
+        <type name="Mutex" c:type="GMutex*"/>
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GMutex" c:type="GMutex**"/>
+          <type name="Mutex" c:type="GMutex**"/>
         </parameter>
       </parameters>
     </function>
     <function name="thread_create_full" c:identifier="g_thread_create_full">
       <return-value>
-        <type name="GThread" c:type="GThread*"/>
+        <type name="Thread" c:type="GThread*"/>
       </return-value>
       <parameters>
         <parameter name="func">
-          <type name="GThreadFunc" c:type="GThreadFunc"/>
+          <type name="ThreadFunc" c:type="GThreadFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -1746,16 +1738,16 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="priority">
-          <type name="GThreadPriority" c:type="GThreadPriority"/>
+          <type name="ThreadPriority" c:type="GThreadPriority"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="thread_self" c:identifier="g_thread_self">
       <return-value>
-        <type name="GThread" c:type="GThread*"/>
+        <type name="Thread" c:type="GThread*"/>
       </return-value>
     </function>
     <function name="thread_exit" c:identifier="g_thread_exit">
@@ -1774,7 +1766,7 @@
       </return-value>
       <parameters>
         <parameter name="thread">
-          <type name="GThread" c:type="GThread*"/>
+          <type name="Thread" c:type="GThread*"/>
         </parameter>
       </parameters>
     </function>
@@ -1784,10 +1776,10 @@
       </return-value>
       <parameters>
         <parameter name="thread">
-          <type name="GThread" c:type="GThread*"/>
+          <type name="Thread" c:type="GThread*"/>
         </parameter>
         <parameter name="priority">
-          <type name="GThreadPriority" c:type="GThreadPriority"/>
+          <type name="ThreadPriority" c:type="GThreadPriority"/>
         </parameter>
       </parameters>
     </function>
@@ -1797,7 +1789,7 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticMutex" c:type="GStaticMutex*"/>
+          <type name="StaticMutex" c:type="GStaticMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1807,22 +1799,17 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticMutex" c:type="GStaticMutex*"/>
+          <type name="StaticMutex" c:type="GStaticMutex*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GStaticPrivate" c:type="_GStaticPrivate">
-      <field name="index">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
     <function name="static_private_init" c:identifier="g_static_private_init">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="private_key">
-          <type name="GStaticPrivate" c:type="GStaticPrivate*"/>
+          <type name="StaticPrivate" c:type="GStaticPrivate*"/>
         </parameter>
       </parameters>
     </function>
@@ -1832,7 +1819,7 @@
       </return-value>
       <parameters>
         <parameter name="private_key">
-          <type name="GStaticPrivate" c:type="GStaticPrivate*"/>
+          <type name="StaticPrivate" c:type="GStaticPrivate*"/>
         </parameter>
       </parameters>
     </function>
@@ -1842,13 +1829,13 @@
       </return-value>
       <parameters>
         <parameter name="private_key">
-          <type name="GStaticPrivate" c:type="GStaticPrivate*"/>
+          <type name="StaticPrivate" c:type="GStaticPrivate*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -1858,20 +1845,19 @@
       </return-value>
       <parameters>
         <parameter name="private_key">
-          <type name="GStaticPrivate" c:type="GStaticPrivate*"/>
+          <type name="StaticPrivate" c:type="GStaticPrivate*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="StaticRecMutex" c:type="GStaticRecMutex"/>
-    <record name="GStaticRecMutex" c:type="_GStaticRecMutex">
+    <record name="StaticRecMutex" c:type="GStaticRecMutex">
       <field name="mutex">
-        <type name="GStaticMutex" c:type="GStaticMutex"/>
+        <type name="StaticMutex" c:type="GStaticMutex"/>
       </field>
       <field name="depth">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="owner">
-        <type name="GSystemThread" c:type="GSystemThread"/>
+        <type name="SystemThread" c:type="GSystemThread"/>
       </field>
     </record>
     <function name="static_rec_mutex_init"
@@ -1881,7 +1867,7 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticRecMutex" c:type="GStaticRecMutex*"/>
+          <type name="StaticRecMutex" c:type="GStaticRecMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1892,7 +1878,7 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticRecMutex" c:type="GStaticRecMutex*"/>
+          <type name="StaticRecMutex" c:type="GStaticRecMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1903,7 +1889,7 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticRecMutex" c:type="GStaticRecMutex*"/>
+          <type name="StaticRecMutex" c:type="GStaticRecMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1914,7 +1900,7 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticRecMutex" c:type="GStaticRecMutex*"/>
+          <type name="StaticRecMutex" c:type="GStaticRecMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1925,21 +1911,21 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticRecMutex" c:type="GStaticRecMutex*"/>
+          <type name="StaticRecMutex" c:type="GStaticRecMutex*"/>
         </parameter>
         <parameter name="depth">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="static_rec_mutex_unlock_full"
               c:identifier="g_static_rec_mutex_unlock_full">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticRecMutex" c:type="GStaticRecMutex*"/>
+          <type name="StaticRecMutex" c:type="GStaticRecMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1950,32 +1936,31 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="GStaticRecMutex" c:type="GStaticRecMutex*"/>
+          <type name="StaticRecMutex" c:type="GStaticRecMutex*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="StaticRWLock" c:type="GStaticRWLock"/>
-    <record name="GStaticRWLock" c:type="_GStaticRWLock">
+    <record name="StaticRWLock" c:type="GStaticRWLock">
       <field name="mutex">
-        <type name="GStaticMutex" c:type="GStaticMutex"/>
+        <type name="StaticMutex" c:type="GStaticMutex"/>
       </field>
       <field name="read_cond">
-        <type name="GCond" c:type="GCond*"/>
+        <type name="Cond" c:type="GCond*"/>
       </field>
       <field name="write_cond">
-        <type name="GCond" c:type="GCond*"/>
+        <type name="Cond" c:type="GCond*"/>
       </field>
       <field name="read_counter">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="have_writer">
         <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="want_to_read">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="want_to_write">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
     <function name="static_rw_lock_init" c:identifier="g_static_rw_lock_init">
@@ -1984,7 +1969,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -1995,7 +1980,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -2006,7 +1991,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -2017,7 +2002,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -2028,7 +2013,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -2039,7 +2024,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -2050,7 +2035,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -2060,7 +2045,7 @@
       </return-value>
       <parameters>
         <parameter name="lock">
-          <type name="GStaticRWLock" c:type="GStaticRWLock*"/>
+          <type name="StaticRWLock" c:type="GStaticRWLock*"/>
         </parameter>
       </parameters>
     </function>
@@ -2070,26 +2055,25 @@
       </return-value>
       <parameters>
         <parameter name="thread_func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GOnceStatus" c:type="GOnceStatus">
-      <member name="s_notcalled"
+    <enumeration name="OnceStatus" c:type="GOnceStatus">
+      <member name="snotcalled"
               value="0"
               c:identifier="G_ONCE_STATUS_NOTCALLED"/>
-      <member name="s_progress"
+      <member name="sprogress"
               value="1"
               c:identifier="G_ONCE_STATUS_PROGRESS"/>
-      <member name="s_ready" value="2" c:identifier="G_ONCE_STATUS_READY"/>
+      <member name="sready" value="2" c:identifier="G_ONCE_STATUS_READY"/>
     </enumeration>
-    <record name="Once" c:type="GOnce"/>
-    <record name="GOnce" c:type="_GOnce">
+    <record name="Once" c:type="GOnce">
       <field name="status">
-        <type name="GOnceStatus" c:type="GOnceStatus"/>
+        <type name="OnceStatus" c:type="GOnceStatus"/>
       </field>
       <field name="retval">
         <type name="any" c:type="gpointer"/>
@@ -2101,10 +2085,10 @@
       </return-value>
       <parameters>
         <parameter name="once">
-          <type name="GOnce" c:type="GOnce*"/>
+          <type name="Once" c:type="GOnce*"/>
         </parameter>
         <parameter name="func">
-          <type name="GThreadFunc" c:type="GThreadFunc"/>
+          <type name="ThreadFunc" c:type="GThreadFunc"/>
         </parameter>
         <parameter name="arg">
           <type name="any" c:type="gpointer"/>
@@ -2117,7 +2101,7 @@
       </return-value>
       <parameters>
         <parameter name="value_location">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -2128,7 +2112,7 @@
       </return-value>
       <parameters>
         <parameter name="value_location">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -2138,7 +2122,7 @@
       </return-value>
       <parameters>
         <parameter name="value_location">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="initialization_value">
           <type name="size" c:type="gsize"/>
@@ -2153,17 +2137,17 @@
     <record name="AsyncQueue" c:type="GAsyncQueue"/>
     <function name="async_queue_new" c:identifier="g_async_queue_new">
       <return-value>
-        <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+        <type name="AsyncQueue" c:type="GAsyncQueue*"/>
       </return-value>
     </function>
     <function name="async_queue_new_full"
               c:identifier="g_async_queue_new_full">
       <return-value>
-        <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+        <type name="AsyncQueue" c:type="GAsyncQueue*"/>
       </return-value>
       <parameters>
         <parameter name="item_free_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -2173,7 +2157,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2183,17 +2167,17 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="async_queue_ref" c:identifier="g_async_queue_ref">
       <return-value>
-        <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+        <type name="AsyncQueue" c:type="GAsyncQueue*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2203,7 +2187,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2214,7 +2198,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2225,7 +2209,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2235,7 +2219,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -2249,7 +2233,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -2263,13 +2247,13 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -2283,13 +2267,13 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -2302,7 +2286,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2313,7 +2297,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2323,7 +2307,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2334,7 +2318,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2345,10 +2329,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="end_time">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
       </parameters>
     </function>
@@ -2359,31 +2343,31 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="end_time">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
       </parameters>
     </function>
     <function name="async_queue_length" c:identifier="g_async_queue_length">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="async_queue_length_unlocked"
               c:identifier="g_async_queue_length_unlocked">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2393,10 +2377,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -2410,24 +2394,24 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="g_async_queue_get_mutex"
+    <function name="async_queue_get_mutex"
               c:identifier="_g_async_queue_get_mutex">
       <return-value>
-        <type name="GMutex" c:type="GMutex*"/>
+        <type name="Mutex" c:type="GMutex*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
+          <type name="AsyncQueue" c:type="GAsyncQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -2458,7 +2442,7 @@
       </return-value>
       <parameters>
         <parameter name="in">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="len">
           <type name="size" c:type="gsize"/>
@@ -2470,10 +2454,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="state">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="save">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -2489,10 +2473,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="state">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="save">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -2502,7 +2486,7 @@
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="len">
           <type name="size" c:type="gsize"/>
@@ -2521,65 +2505,65 @@
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="out">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="state">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="save">
-          <type name="guint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="base64_decode" c:identifier="g_base64_decode">
       <return-value>
-        <type name="guchar" c:type="guchar*"/>
+        <type name="uchar" c:type="guchar*"/>
       </return-value>
       <parameters>
         <parameter name="text">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="out_len">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GBookmarkFileError" c:type="GBookmarkFileError">
-      <member name="r_invalid_uri"
+    <enumeration name="BookmarkFileError" c:type="GBookmarkFileError">
+      <member name="rinvaliduri"
               value="0"
               c:identifier="G_BOOKMARK_FILE_ERROR_INVALID_URI"/>
-      <member name="r_invalid_value"
+      <member name="rinvalidvalue"
               value="1"
               c:identifier="G_BOOKMARK_FILE_ERROR_INVALID_VALUE"/>
-      <member name="r_app_not_registered"
+      <member name="rappnotregistered"
               value="2"
               c:identifier="G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED"/>
-      <member name="r_uri_not_found"
+      <member name="rurinotfound"
               value="3"
               c:identifier="G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND"/>
-      <member name="r_read"
+      <member name="rread"
               value="4"
               c:identifier="G_BOOKMARK_FILE_ERROR_READ"/>
-      <member name="r_unknown_encoding"
+      <member name="runknownencoding"
               value="5"
               c:identifier="G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING"/>
-      <member name="r_write"
+      <member name="rwrite"
               value="6"
               c:identifier="G_BOOKMARK_FILE_ERROR_WRITE"/>
-      <member name="r_file_not_found"
+      <member name="rfilenotfound"
               value="7"
               c:identifier="G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND"/>
     </enumeration>
     <function name="bookmark_file_error_quark"
               c:identifier="g_bookmark_file_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <record name="BookmarkFile" c:type="GBookmarkFile"/>
     <function name="bookmark_file_new" c:identifier="g_bookmark_file_new">
       <return-value>
-        <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+        <type name="BookmarkFile" c:type="GBookmarkFile*"/>
       </return-value>
     </function>
     <function name="bookmark_file_free" c:identifier="g_bookmark_file_free">
@@ -2588,7 +2572,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -2599,13 +2583,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="filename">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2616,7 +2600,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="data">
           <type name="string" c:type="gchar*"/>
@@ -2625,7 +2609,7 @@
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2636,16 +2620,16 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="file">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="full_path">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2656,13 +2640,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2673,13 +2657,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="filename">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2690,7 +2674,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2707,13 +2691,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2724,7 +2708,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2741,13 +2725,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2758,7 +2742,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2775,13 +2759,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2792,13 +2776,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="groups">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
           <type name="size" c:type="gsize"/>
@@ -2812,7 +2796,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2829,7 +2813,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2838,27 +2822,27 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="bookmark_file_get_groups"
               c:identifier="g_bookmark_file_get_groups">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2869,7 +2853,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2889,7 +2873,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2898,27 +2882,27 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="bookmark_file_get_applications"
               c:identifier="g_bookmark_file_get_applications">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2929,7 +2913,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2941,13 +2925,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="count">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="stamp">
           <type name="time_t" c:type="time_t"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2958,7 +2942,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -2967,16 +2951,16 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="exec">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="count">
-          <type name="guint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
         <parameter name="stamp">
           <type name="time_t" c:type="time_t*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -2987,7 +2971,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3004,13 +2988,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3021,7 +3005,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3041,19 +3025,19 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="href">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="mime_type">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3064,7 +3048,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3081,13 +3065,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3098,7 +3082,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3115,13 +3099,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3132,7 +3116,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3149,13 +3133,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3166,7 +3150,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3176,25 +3160,25 @@
     <function name="bookmark_file_get_size"
               c:identifier="g_bookmark_file_get_size">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
       </parameters>
     </function>
     <function name="bookmark_file_get_uris"
               c:identifier="g_bookmark_file_get_uris">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -3205,7 +3189,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3214,7 +3198,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3225,7 +3209,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
@@ -3234,7 +3218,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3245,13 +3229,13 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3262,7 +3246,7 @@
       </return-value>
       <parameters>
         <parameter name="bookmark">
-          <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
+          <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="old_uri">
           <type name="string" c:type="gchar*"/>
@@ -3271,7 +3255,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -3338,23 +3322,23 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GSliceConfig" c:type="GSliceConfig">
-      <member name="g_always_malloc"
+    <enumeration name="SliceConfig" c:type="GSliceConfig">
+      <member name="galwaysmalloc"
               value="1"
               c:identifier="G_SLICE_CONFIG_ALWAYS_MALLOC"/>
-      <member name="g_bypass_magazines"
+      <member name="gbypassmagazines"
               value="2"
               c:identifier="G_SLICE_CONFIG_BYPASS_MAGAZINES"/>
-      <member name="g_working_set_msecs"
+      <member name="gworkingsetmsecs"
               value="3"
               c:identifier="G_SLICE_CONFIG_WORKING_SET_MSECS"/>
-      <member name="g_color_increment"
+      <member name="gcolorincrement"
               value="4"
               c:identifier="G_SLICE_CONFIG_COLOR_INCREMENT"/>
-      <member name="g_chunk_sizes"
+      <member name="gchunksizes"
               value="5"
               c:identifier="G_SLICE_CONFIG_CHUNK_SIZES"/>
-      <member name="g_contention_counter"
+      <member name="gcontentioncounter"
               value="6"
               c:identifier="G_SLICE_CONFIG_CONTENTION_COUNTER"/>
     </enumeration>
@@ -3364,41 +3348,111 @@
       </return-value>
       <parameters>
         <parameter name="ckey">
-          <type name="GSliceConfig" c:type="GSliceConfig"/>
+          <type name="SliceConfig" c:type="GSliceConfig"/>
         </parameter>
         <parameter name="value">
-          <type name="gint64" c:type="gint64"/>
+          <type name="int64" c:type="gint64"/>
         </parameter>
       </parameters>
     </function>
     <function name="slice_get_config" c:identifier="g_slice_get_config">
       <return-value>
-        <type name="gint64" c:type="gint64"/>
+        <type name="int64" c:type="gint64"/>
       </return-value>
       <parameters>
         <parameter name="ckey">
-          <type name="GSliceConfig" c:type="GSliceConfig"/>
+          <type name="SliceConfig" c:type="GSliceConfig"/>
         </parameter>
       </parameters>
     </function>
     <function name="slice_get_config_state"
               c:identifier="g_slice_get_config_state">
       <return-value>
-        <type name="gint64" c:type="gint64*"/>
+        <type name="int64" c:type="gint64*"/>
       </return-value>
       <parameters>
         <parameter name="ckey">
-          <type name="GSliceConfig" c:type="GSliceConfig"/>
+          <type name="SliceConfig" c:type="GSliceConfig"/>
         </parameter>
         <parameter name="address">
-          <type name="gint64" c:type="gint64"/>
+          <type name="int64" c:type="gint64"/>
         </parameter>
         <parameter name="n_values">
-          <type name="guint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="MemVTable" c:type="GMemVTable"/>
+    <record name="MemVTable" c:type="GMemVTable">
+      <callback name="malloc" c:type="malloc">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="n_bytes">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="realloc" c:type="realloc">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="mem">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="n_bytes">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="free" c:type="free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="mem">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="calloc" c:type="calloc">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="n_blocks">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="n_block_bytes">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="try_malloc" c:type="try_malloc">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="n_bytes">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="try_realloc" c:type="try_realloc">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="mem">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="n_bytes">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="malloc" c:identifier="g_malloc">
       <return-value>
         <type name="any" c:type="gpointer"/>
@@ -3475,84 +3529,13 @@
         </parameter>
       </parameters>
     </function>
-    <record name="GMemVTable" c:type="_GMemVTable">
-      <callback name="malloc">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="realloc">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="mem">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="free">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="mem">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="calloc">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="n_blocks">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-          <parameter name="n_block_bytes">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="try_malloc">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="try_realloc">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="mem">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
     <function name="mem_set_vtable" c:identifier="g_mem_set_vtable">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="vtable">
-          <type name="GMemVTable" c:type="GMemVTable*"/>
+          <type name="MemVTable" c:type="GMemVTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -3571,20 +3554,20 @@
     <record name="MemChunk" c:type="GMemChunk"/>
     <function name="mem_chunk_new" c:identifier="g_mem_chunk_new">
       <return-value>
-        <type name="GMemChunk" c:type="GMemChunk*"/>
+        <type name="MemChunk" c:type="GMemChunk*"/>
       </return-value>
       <parameters>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="atom_size">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="area_size">
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="type">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3594,7 +3577,7 @@
       </return-value>
       <parameters>
         <parameter name="mem_chunk">
-          <type name="GMemChunk" c:type="GMemChunk*"/>
+          <type name="MemChunk" c:type="GMemChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -3604,7 +3587,7 @@
       </return-value>
       <parameters>
         <parameter name="mem_chunk">
-          <type name="GMemChunk" c:type="GMemChunk*"/>
+          <type name="MemChunk" c:type="GMemChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -3614,7 +3597,7 @@
       </return-value>
       <parameters>
         <parameter name="mem_chunk">
-          <type name="GMemChunk" c:type="GMemChunk*"/>
+          <type name="MemChunk" c:type="GMemChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -3624,7 +3607,7 @@
       </return-value>
       <parameters>
         <parameter name="mem_chunk">
-          <type name="GMemChunk" c:type="GMemChunk*"/>
+          <type name="MemChunk" c:type="GMemChunk*"/>
         </parameter>
         <parameter name="mem">
           <type name="any" c:type="gpointer"/>
@@ -3637,7 +3620,7 @@
       </return-value>
       <parameters>
         <parameter name="mem_chunk">
-          <type name="GMemChunk" c:type="GMemChunk*"/>
+          <type name="MemChunk" c:type="GMemChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -3647,7 +3630,7 @@
       </return-value>
       <parameters>
         <parameter name="mem_chunk">
-          <type name="GMemChunk" c:type="GMemChunk*"/>
+          <type name="MemChunk" c:type="GMemChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -3657,7 +3640,7 @@
       </return-value>
       <parameters>
         <parameter name="mem_chunk">
-          <type name="GMemChunk" c:type="GMemChunk*"/>
+          <type name="MemChunk" c:type="GMemChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -3673,14 +3656,14 @@
     </function>
     <function name="allocator_new" c:identifier="g_allocator_new">
       <return-value>
-        <type name="GAllocator" c:type="GAllocator*"/>
+        <type name="Allocator" c:type="GAllocator*"/>
       </return-value>
       <parameters>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n_preallocs">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -3690,25 +3673,24 @@
       </return-value>
       <parameters>
         <parameter name="allocator">
-          <type name="GAllocator" c:type="GAllocator*"/>
+          <type name="Allocator" c:type="GAllocator*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="List" c:type="GList"/>
-    <record name="GList" c:type="_GList">
+    <record name="List" c:type="GList">
       <field name="data">
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="next">
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </field>
       <field name="prev">
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </field>
     </record>
     <function name="list_alloc" c:identifier="g_list_alloc">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
     </function>
     <function name="list_free" c:identifier="g_list_free">
@@ -3717,7 +3699,7 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -3727,17 +3709,17 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_append" c:identifier="g_list_append">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3746,11 +3728,11 @@
     </function>
     <function name="list_prepend" c:identifier="g_list_prepend">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3759,50 +3741,50 @@
     </function>
     <function name="list_insert" c:identifier="g_list_insert">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_insert_sorted" c:identifier="g_list_insert_sorted">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_insert_sorted_with_data"
               c:identifier="g_list_insert_sorted_with_data">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -3811,14 +3793,14 @@
     </function>
     <function name="list_insert_before" c:identifier="g_list_insert_before">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3827,24 +3809,24 @@
     </function>
     <function name="list_concat" c:identifier="g_list_concat">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list1">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="list2">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_remove" c:identifier="g_list_remove">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -3853,11 +3835,11 @@
     </function>
     <function name="list_remove_all" c:identifier="g_list_remove_all">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -3866,83 +3848,83 @@
     </function>
     <function name="list_remove_link" c:identifier="g_list_remove_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="llink">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_delete_link" c:identifier="g_list_delete_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_reverse" c:identifier="g_list_reverse">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_copy" c:identifier="g_list_copy">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_nth" c:identifier="g_list_nth">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_nth_prev" c:identifier="g_list_nth_prev">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_find" c:identifier="g_list_find">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -3951,40 +3933,40 @@
     </function>
     <function name="list_find_custom" c:identifier="g_list_find_custom">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_position" c:identifier="g_list_position">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="llink">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_index" c:identifier="g_list_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -3993,31 +3975,31 @@
     </function>
     <function name="list_last" c:identifier="g_list_last">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_first" c:identifier="g_list_first">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_length" c:identifier="g_list_length">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -4027,10 +4009,10 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -4039,27 +4021,27 @@
     </function>
     <function name="list_sort" c:identifier="g_list_sort">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="list_sort_with_data" c:identifier="g_list_sort_with_data">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -4072,10 +4054,10 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -4095,7 +4077,7 @@
       </return-value>
     </function>
     <record name="Cache" c:type="GCache"/>
-    <callback name="GCacheNewFunc">
+    <callback name="CacheNewFunc" c:type="GCacheNewFunc">
       <return-value>
         <type name="any" c:type="gpointer"/>
       </return-value>
@@ -4105,7 +4087,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GCacheDupFunc">
+    <callback name="CacheDupFunc" c:type="GCacheDupFunc">
       <return-value>
         <type name="any" c:type="gpointer"/>
       </return-value>
@@ -4115,7 +4097,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GCacheDestroyFunc">
+    <callback name="CacheDestroyFunc" c:type="GCacheDestroyFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -4127,29 +4109,29 @@
     </callback>
     <function name="cache_new" c:identifier="g_cache_new">
       <return-value>
-        <type name="GCache" c:type="GCache*"/>
+        <type name="Cache" c:type="GCache*"/>
       </return-value>
       <parameters>
         <parameter name="value_new_func">
-          <type name="GCacheNewFunc" c:type="GCacheNewFunc"/>
+          <type name="CacheNewFunc" c:type="GCacheNewFunc"/>
         </parameter>
         <parameter name="value_destroy_func">
-          <type name="GCacheDestroyFunc" c:type="GCacheDestroyFunc"/>
+          <type name="CacheDestroyFunc" c:type="GCacheDestroyFunc"/>
         </parameter>
         <parameter name="key_dup_func">
-          <type name="GCacheDupFunc" c:type="GCacheDupFunc"/>
+          <type name="CacheDupFunc" c:type="GCacheDupFunc"/>
         </parameter>
         <parameter name="key_destroy_func">
-          <type name="GCacheDestroyFunc" c:type="GCacheDestroyFunc"/>
+          <type name="CacheDestroyFunc" c:type="GCacheDestroyFunc"/>
         </parameter>
         <parameter name="hash_key_func">
-          <type name="GHashFunc" c:type="GHashFunc"/>
+          <type name="HashFunc" c:type="GHashFunc"/>
         </parameter>
         <parameter name="hash_value_func">
-          <type name="GHashFunc" c:type="GHashFunc"/>
+          <type name="HashFunc" c:type="GHashFunc"/>
         </parameter>
         <parameter name="key_equal_func">
-          <type name="GEqualFunc" c:type="GEqualFunc"/>
+          <type name="EqualFunc" c:type="GEqualFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -4159,7 +4141,7 @@
       </return-value>
       <parameters>
         <parameter name="cache">
-          <type name="GCache" c:type="GCache*"/>
+          <type name="Cache" c:type="GCache*"/>
         </parameter>
       </parameters>
     </function>
@@ -4169,7 +4151,7 @@
       </return-value>
       <parameters>
         <parameter name="cache">
-          <type name="GCache" c:type="GCache*"/>
+          <type name="Cache" c:type="GCache*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gpointer"/>
@@ -4182,7 +4164,7 @@
       </return-value>
       <parameters>
         <parameter name="cache">
-          <type name="GCache" c:type="GCache*"/>
+          <type name="Cache" c:type="GCache*"/>
         </parameter>
         <parameter name="value">
           <type name="any" c:type="gconstpointer"/>
@@ -4195,10 +4177,10 @@
       </return-value>
       <parameters>
         <parameter name="cache">
-          <type name="GCache" c:type="GCache*"/>
+          <type name="Cache" c:type="GCache*"/>
         </parameter>
         <parameter name="func">
-          <type name="GHFunc" c:type="GHFunc"/>
+          <type name="HFunc" c:type="GHFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -4211,17 +4193,17 @@
       </return-value>
       <parameters>
         <parameter name="cache">
-          <type name="GCache" c:type="GCache*"/>
+          <type name="Cache" c:type="GCache*"/>
         </parameter>
         <parameter name="func">
-          <type name="GHFunc" c:type="GHFunc"/>
+          <type name="HFunc" c:type="GHFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GChecksumType" c:type="GChecksumType">
+    <enumeration name="ChecksumType" c:type="GChecksumType">
       <member name="md5" value="0" c:identifier="G_CHECKSUM_MD5"/>
       <member name="sha1" value="1" c:identifier="G_CHECKSUM_SHA1"/>
       <member name="sha256" value="2" c:identifier="G_CHECKSUM_SHA256"/>
@@ -4234,27 +4216,27 @@
       </return-value>
       <parameters>
         <parameter name="checksum_type">
-          <type name="GChecksumType" c:type="GChecksumType"/>
+          <type name="ChecksumType" c:type="GChecksumType"/>
         </parameter>
       </parameters>
     </function>
     <function name="checksum_new" c:identifier="g_checksum_new">
       <return-value>
-        <type name="GChecksum" c:type="GChecksum*"/>
+        <type name="Checksum" c:type="GChecksum*"/>
       </return-value>
       <parameters>
         <parameter name="checksum_type">
-          <type name="GChecksumType" c:type="GChecksumType"/>
+          <type name="ChecksumType" c:type="GChecksumType"/>
         </parameter>
       </parameters>
     </function>
     <function name="checksum_copy" c:identifier="g_checksum_copy">
       <return-value>
-        <type name="GChecksum" c:type="GChecksum*"/>
+        <type name="Checksum" c:type="GChecksum*"/>
       </return-value>
       <parameters>
         <parameter name="checksum">
-          <type name="GChecksum" c:type="GChecksum*"/>
+          <type name="Checksum" c:type="GChecksum*"/>
         </parameter>
       </parameters>
     </function>
@@ -4264,7 +4246,7 @@
       </return-value>
       <parameters>
         <parameter name="checksum">
-          <type name="GChecksum" c:type="GChecksum*"/>
+          <type name="Checksum" c:type="GChecksum*"/>
         </parameter>
       </parameters>
     </function>
@@ -4274,10 +4256,10 @@
       </return-value>
       <parameters>
         <parameter name="checksum">
-          <type name="GChecksum" c:type="GChecksum*"/>
+          <type name="Checksum" c:type="GChecksum*"/>
         </parameter>
         <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
           <type name="ssize" c:type="gssize"/>
@@ -4290,7 +4272,7 @@
       </return-value>
       <parameters>
         <parameter name="checksum">
-          <type name="GChecksum" c:type="GChecksum*"/>
+          <type name="Checksum" c:type="GChecksum*"/>
         </parameter>
       </parameters>
     </function>
@@ -4300,13 +4282,13 @@
       </return-value>
       <parameters>
         <parameter name="checksum">
-          <type name="GChecksum" c:type="GChecksum*"/>
+          <type name="Checksum" c:type="GChecksum*"/>
         </parameter>
         <parameter name="buffer">
-          <type name="guint8" c:type="guint8*"/>
+          <type name="uint8" c:type="guint8*"/>
         </parameter>
         <parameter name="digest_len">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -4317,10 +4299,10 @@
       </return-value>
       <parameters>
         <parameter name="checksum_type">
-          <type name="GChecksumType" c:type="GChecksumType"/>
+          <type name="ChecksumType" c:type="GChecksumType"/>
         </parameter>
         <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
           <type name="size" c:type="gsize"/>
@@ -4334,7 +4316,7 @@
       </return-value>
       <parameters>
         <parameter name="checksum_type">
-          <type name="GChecksumType" c:type="GChecksumType"/>
+          <type name="ChecksumType" c:type="GChecksumType"/>
         </parameter>
         <parameter name="str">
           <type name="string" c:type="gchar*"/>
@@ -4344,8 +4326,24 @@
         </parameter>
       </parameters>
     </function>
-    <record name="Completion" c:type="GCompletion"/>
-    <callback name="GCompletionFunc">
+    <record name="Completion" c:type="GCompletion">
+      <field name="items">
+        <type name="List" c:type="GList*"/>
+      </field>
+      <field name="func">
+        <type name="CompletionFunc" c:type="GCompletionFunc"/>
+      </field>
+      <field name="prefix">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="cache">
+        <type name="List" c:type="GList*"/>
+      </field>
+      <field name="strncmp_func">
+        <type name="CompletionStrncmpFunc" c:type="GCompletionStrncmpFunc"/>
+      </field>
+    </record>
+    <callback name="CompletionFunc" c:type="GCompletionFunc">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -4355,9 +4353,9 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GCompletionStrncmpFunc">
+    <callback name="CompletionStrncmpFunc" c:type="GCompletionStrncmpFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="s1">
@@ -4371,30 +4369,13 @@
         </parameter>
       </parameters>
     </callback>
-    <record name="GCompletion" c:type="_GCompletion">
-      <field name="items">
-        <type name="GList" c:type="GList*"/>
-      </field>
-      <field name="func">
-        <type name="GCompletionFunc" c:type="GCompletionFunc"/>
-      </field>
-      <field name="prefix">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="cache">
-        <type name="GList" c:type="GList*"/>
-      </field>
-      <field name="strncmp_func">
-        <type name="GCompletionStrncmpFunc" c:type="GCompletionStrncmpFunc"/>
-      </field>
-    </record>
     <function name="completion_new" c:identifier="g_completion_new">
       <return-value>
-        <type name="GCompletion" c:type="GCompletion*"/>
+        <type name="Completion" c:type="GCompletion*"/>
       </return-value>
       <parameters>
         <parameter name="func">
-          <type name="GCompletionFunc" c:type="GCompletionFunc"/>
+          <type name="CompletionFunc" c:type="GCompletionFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -4405,10 +4386,10 @@
       </return-value>
       <parameters>
         <parameter name="cmp">
-          <type name="GCompletion" c:type="GCompletion*"/>
+          <type name="Completion" c:type="GCompletion*"/>
         </parameter>
         <parameter name="items">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -4419,10 +4400,10 @@
       </return-value>
       <parameters>
         <parameter name="cmp">
-          <type name="GCompletion" c:type="GCompletion*"/>
+          <type name="Completion" c:type="GCompletion*"/>
         </parameter>
         <parameter name="items">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -4433,40 +4414,40 @@
       </return-value>
       <parameters>
         <parameter name="cmp">
-          <type name="GCompletion" c:type="GCompletion*"/>
+          <type name="Completion" c:type="GCompletion*"/>
         </parameter>
       </parameters>
     </function>
     <function name="completion_complete" c:identifier="g_completion_complete">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="cmp">
-          <type name="GCompletion" c:type="GCompletion*"/>
+          <type name="Completion" c:type="GCompletion*"/>
         </parameter>
         <parameter name="prefix">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="new_prefix">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
     <function name="completion_complete_utf8"
               c:identifier="g_completion_complete_utf8">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="cmp">
-          <type name="GCompletion" c:type="GCompletion*"/>
+          <type name="Completion" c:type="GCompletion*"/>
         </parameter>
         <parameter name="prefix">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="new_prefix">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -4477,10 +4458,10 @@
       </return-value>
       <parameters>
         <parameter name="cmp">
-          <type name="GCompletion" c:type="GCompletion*"/>
+          <type name="Completion" c:type="GCompletion*"/>
         </parameter>
         <parameter name="strncmp_func">
-          <type name="GCompletionStrncmpFunc" c:type="GCompletionStrncmpFunc"/>
+          <type name="CompletionStrncmpFunc" c:type="GCompletionStrncmpFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -4490,36 +4471,34 @@
       </return-value>
       <parameters>
         <parameter name="cmp">
-          <type name="GCompletion" c:type="GCompletion*"/>
+          <type name="Completion" c:type="GCompletion*"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GConvertError" c:type="GConvertError">
-      <member name="r_no_conversion"
+    <enumeration name="ConvertError" c:type="GConvertError">
+      <member name="rnoconversion"
               value="0"
               c:identifier="G_CONVERT_ERROR_NO_CONVERSION"/>
-      <member name="r_illegal_sequence"
+      <member name="rillegalsequence"
               value="1"
               c:identifier="G_CONVERT_ERROR_ILLEGAL_SEQUENCE"/>
-      <member name="r_failed" value="2" c:identifier="G_CONVERT_ERROR_FAILED"/>
-      <member name="r_partial_input"
+      <member name="rfailed" value="2" c:identifier="G_CONVERT_ERROR_FAILED"/>
+      <member name="rpartialinput"
               value="3"
               c:identifier="G_CONVERT_ERROR_PARTIAL_INPUT"/>
-      <member name="r_bad_uri"
-              value="4"
-              c:identifier="G_CONVERT_ERROR_BAD_URI"/>
-      <member name="r_not_absolute_path"
+      <member name="rbaduri" value="4" c:identifier="G_CONVERT_ERROR_BAD_URI"/>
+      <member name="rnotabsolutepath"
               value="5"
               c:identifier="G_CONVERT_ERROR_NOT_ABSOLUTE_PATH"/>
     </enumeration>
     <function name="convert_error_quark" c:identifier="g_convert_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <function name="iconv_open" c:identifier="g_iconv_open">
       <return-value>
-        <type name="GIConv" c:type="GIConv"/>
+        <type name="IConv" c:type="GIConv"/>
       </return-value>
       <parameters>
         <parameter name="to_codeset">
@@ -4536,29 +4515,29 @@
       </return-value>
       <parameters>
         <parameter name="converter">
-          <type name="GIConv" c:type="GIConv"/>
+          <type name="IConv" c:type="GIConv"/>
         </parameter>
         <parameter name="inbuf">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="inbytes_left">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="outbuf">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="outbytes_left">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
     <function name="iconv_close" c:identifier="g_iconv_close">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="converter">
-          <type name="GIConv" c:type="GIConv"/>
+          <type name="IConv" c:type="GIConv"/>
         </parameter>
       </parameters>
     </function>
@@ -4580,13 +4559,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4602,16 +4581,16 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="converter">
-          <type name="GIConv" c:type="GIConv"/>
+          <type name="IConv" c:type="GIConv"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4637,13 +4616,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4659,13 +4638,13 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4681,13 +4660,13 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4703,13 +4682,13 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4725,13 +4704,13 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4744,10 +4723,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="hostname">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4763,7 +4742,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -4778,14 +4757,14 @@
         </parameter>
       </parameters>
     </function>
-    <function name="get_filename_charsets"
+    <function name="et_filename_charsets"
               c:identifier="g_get_filename_charsets">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="charsets">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="char" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -4803,7 +4782,7 @@
     <function name="uri_list_extract_uris"
               c:identifier="g_uri_list_extract_uris">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="uri_list">
@@ -4812,13 +4791,13 @@
       </parameters>
     </function>
     <record name="Data" c:type="GData"/>
-    <callback name="GDataForeachFunc">
+    <callback name="DataForeachFunc" c:type="GDataForeachFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -4834,7 +4813,7 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
       </parameters>
     </function>
@@ -4844,7 +4823,7 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
       </parameters>
     </function>
@@ -4855,10 +4834,10 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -4869,16 +4848,16 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -4889,10 +4868,10 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -4902,10 +4881,10 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
         <parameter name="func">
-          <type name="GDataForeachFunc" c:type="GDataForeachFunc"/>
+          <type name="DataForeachFunc" c:type="GDataForeachFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -4918,10 +4897,10 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
         <parameter name="flags">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -4932,20 +4911,20 @@
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
         <parameter name="flags">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="datalist_get_flags" c:identifier="g_datalist_get_flags">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="datalist">
-          <type name="GData" c:type="GData**"/>
+          <type name="Data" c:type="GData**"/>
         </parameter>
       </parameters>
     </function>
@@ -4968,7 +4947,7 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -4982,13 +4961,13 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -5002,7 +4981,7 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -5015,21 +4994,40 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GDataForeachFunc" c:type="GDataForeachFunc"/>
+          <type name="DataForeachFunc" c:type="GDataForeachFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <record name="Date" c:type="GDate"/>
-    <enumeration name="GDateDMY" c:type="GDateDMY">
+    <record name="Date" c:type="GDate">
+      <field name="julian_days">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="julian">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="dmy">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="day">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="month">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="year">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <enumeration name="DateDMY" c:type="GDateDMY">
       <member name="ay" value="0" c:identifier="G_DATE_DAY"/>
       <member name="month" value="1" c:identifier="G_DATE_MONTH"/>
       <member name="year" value="2" c:identifier="G_DATE_YEAR"/>
     </enumeration>
-    <enumeration name="GDateWeekday" c:type="GDateWeekday">
-      <member name="bad_weekday" value="0" c:identifier="G_DATE_BAD_WEEKDAY"/>
+    <enumeration name="DateWeekday" c:type="GDateWeekday">
+      <member name="badweekday" value="0" c:identifier="G_DATE_BAD_WEEKDAY"/>
       <member name="monday" value="1" c:identifier="G_DATE_MONDAY"/>
       <member name="tuesday" value="2" c:identifier="G_DATE_TUESDAY"/>
       <member name="dnesday" value="3" c:identifier="G_DATE_WEDNESDAY"/>
@@ -5038,8 +5036,8 @@
       <member name="saturday" value="6" c:identifier="G_DATE_SATURDAY"/>
       <member name="sunday" value="7" c:identifier="G_DATE_SUNDAY"/>
     </enumeration>
-    <enumeration name="GDateMonth" c:type="GDateMonth">
-      <member name="bad_month" value="0" c:identifier="G_DATE_BAD_MONTH"/>
+    <enumeration name="DateMonth" c:type="GDateMonth">
+      <member name="badmonth" value="0" c:identifier="G_DATE_BAD_MONTH"/>
       <member name="january" value="1" c:identifier="G_DATE_JANUARY"/>
       <member name="february" value="2" c:identifier="G_DATE_FEBRUARY"/>
       <member name="arch" value="3" c:identifier="G_DATE_MARCH"/>
@@ -5053,50 +5051,30 @@
       <member name="november" value="11" c:identifier="G_DATE_NOVEMBER"/>
       <member name="december" value="12" c:identifier="G_DATE_DECEMBER"/>
     </enumeration>
-    <record name="GDate" c:type="_GDate">
-      <field name="julian_days">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="julian">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="dmy">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="day">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="month">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="year">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
     <function name="date_new" c:identifier="g_date_new">
       <return-value>
-        <type name="GDate" c:type="GDate*"/>
+        <type name="Date" c:type="GDate*"/>
       </return-value>
     </function>
     <function name="date_new_dmy" c:identifier="g_date_new_dmy">
       <return-value>
-        <type name="GDate" c:type="GDate*"/>
+        <type name="Date" c:type="GDate*"/>
       </return-value>
       <parameters>
         <parameter name="day">
-          <type name="GDateDay" c:type="GDateDay"/>
+          <type name="DateDay" c:type="GDateDay"/>
         </parameter>
         <parameter name="month">
-          <type name="GDateMonth" c:type="GDateMonth"/>
+          <type name="DateMonth" c:type="GDateMonth"/>
         </parameter>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_new_julian" c:identifier="g_date_new_julian">
       <return-value>
-        <type name="GDate" c:type="GDate*"/>
+        <type name="Date" c:type="GDate*"/>
       </return-value>
       <parameters>
         <parameter name="julian_day">
@@ -5110,7 +5088,7 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5120,7 +5098,7 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5130,7 +5108,7 @@
       </return-value>
       <parameters>
         <parameter name="day">
-          <type name="GDateDay" c:type="GDateDay"/>
+          <type name="DateDay" c:type="GDateDay"/>
         </parameter>
       </parameters>
     </function>
@@ -5140,7 +5118,7 @@
       </return-value>
       <parameters>
         <parameter name="month">
-          <type name="GDateMonth" c:type="GDateMonth"/>
+          <type name="DateMonth" c:type="GDateMonth"/>
         </parameter>
       </parameters>
     </function>
@@ -5150,7 +5128,7 @@
       </return-value>
       <parameters>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
@@ -5160,7 +5138,7 @@
       </return-value>
       <parameters>
         <parameter name="weekday">
-          <type name="GDateWeekday" c:type="GDateWeekday"/>
+          <type name="DateWeekday" c:type="GDateWeekday"/>
         </parameter>
       </parameters>
     </function>
@@ -5180,53 +5158,53 @@
       </return-value>
       <parameters>
         <parameter name="day">
-          <type name="GDateDay" c:type="GDateDay"/>
+          <type name="DateDay" c:type="GDateDay"/>
         </parameter>
         <parameter name="month">
-          <type name="GDateMonth" c:type="GDateMonth"/>
+          <type name="DateMonth" c:type="GDateMonth"/>
         </parameter>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_weekday" c:identifier="g_date_get_weekday">
       <return-value>
-        <type name="GDateWeekday" c:type="GDateWeekday"/>
+        <type name="DateWeekday" c:type="GDateWeekday"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_month" c:identifier="g_date_get_month">
       <return-value>
-        <type name="GDateMonth" c:type="GDateMonth"/>
+        <type name="DateMonth" c:type="GDateMonth"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_year" c:identifier="g_date_get_year">
       <return-value>
-        <type name="GDateYear" c:type="GDateYear"/>
+        <type name="DateYear" c:type="GDateYear"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_day" c:identifier="g_date_get_day">
       <return-value>
-        <type name="GDateDay" c:type="GDateDay"/>
+        <type name="DateDay" c:type="GDateDay"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5236,51 +5214,51 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_day_of_year"
               c:identifier="g_date_get_day_of_year">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_monday_week_of_year"
               c:identifier="g_date_get_monday_week_of_year">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_sunday_week_of_year"
               c:identifier="g_date_get_sunday_week_of_year">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_get_iso8601_week_of_year"
               c:identifier="g_date_get_iso8601_week_of_year">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5290,10 +5268,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="n_dates">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -5303,7 +5281,7 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="str">
           <type name="string" c:type="gchar*"/>
@@ -5316,7 +5294,7 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="timet">
           <type name="time_t" c:type="time_t"/>
@@ -5329,10 +5307,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="timeval">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
       </parameters>
     </function>
@@ -5342,10 +5320,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="time_">
-          <type name="GTime" c:type="GTime"/>
+          <type name="Time" c:type="GTime"/>
         </parameter>
       </parameters>
     </function>
@@ -5355,10 +5333,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="month">
-          <type name="GDateMonth" c:type="GDateMonth"/>
+          <type name="DateMonth" c:type="GDateMonth"/>
         </parameter>
       </parameters>
     </function>
@@ -5368,10 +5346,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="day">
-          <type name="GDateDay" c:type="GDateDay"/>
+          <type name="DateDay" c:type="GDateDay"/>
         </parameter>
       </parameters>
     </function>
@@ -5381,10 +5359,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
@@ -5394,16 +5372,16 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="day">
-          <type name="GDateDay" c:type="GDateDay"/>
+          <type name="DateDay" c:type="GDateDay"/>
         </parameter>
         <parameter name="month">
-          <type name="GDateMonth" c:type="GDateMonth"/>
+          <type name="DateMonth" c:type="GDateMonth"/>
         </parameter>
         <parameter name="y">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
@@ -5413,7 +5391,7 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="julian_date">
           <type name="uint32" c:type="guint32"/>
@@ -5427,7 +5405,7 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5438,7 +5416,7 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5448,10 +5426,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="n_days">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -5461,10 +5439,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="n_days">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -5474,10 +5452,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="n_months">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -5488,10 +5466,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="n_months">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -5501,10 +5479,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="n_years">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -5514,10 +5492,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="n_years">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -5527,7 +5505,7 @@
       </return-value>
       <parameters>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
@@ -5538,10 +5516,10 @@
       </return-value>
       <parameters>
         <parameter name="month">
-          <type name="GDateMonth" c:type="GDateMonth"/>
+          <type name="DateMonth" c:type="GDateMonth"/>
         </parameter>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
@@ -5552,7 +5530,7 @@
       </return-value>
       <parameters>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
@@ -5563,33 +5541,33 @@
       </return-value>
       <parameters>
         <parameter name="year">
-          <type name="GDateYear" c:type="GDateYear"/>
+          <type name="DateYear" c:type="GDateYear"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_days_between" c:identifier="g_date_days_between">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="date1">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="date2">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <function name="date_compare" c:identifier="g_date_compare">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="lhs">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="rhs">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5599,10 +5577,10 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="tm">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
       </parameters>
     </function>
@@ -5612,13 +5590,13 @@
       </return-value>
       <parameters>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="min_date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="max_date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5628,10 +5606,10 @@
       </return-value>
       <parameters>
         <parameter name="date1">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
         <parameter name="date2">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
@@ -5650,24 +5628,24 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="date">
-          <type name="GDate" c:type="GDate*"/>
+          <type name="Date" c:type="GDate*"/>
         </parameter>
       </parameters>
     </function>
     <record name="Dir" c:type="GDir"/>
     <function name="dir_open" c:identifier="g_dir_open">
       <return-value>
-        <type name="GDir" c:type="GDir*"/>
+        <type name="Dir" c:type="GDir*"/>
       </return-value>
       <parameters>
         <parameter name="path">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="flags">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5677,7 +5655,7 @@
       </return-value>
       <parameters>
         <parameter name="dir">
-          <type name="GDir" c:type="GDir*"/>
+          <type name="Dir" c:type="GDir*"/>
         </parameter>
       </parameters>
     </function>
@@ -5687,7 +5665,7 @@
       </return-value>
       <parameters>
         <parameter name="dir">
-          <type name="GDir" c:type="GDir*"/>
+          <type name="Dir" c:type="GDir*"/>
         </parameter>
       </parameters>
     </function>
@@ -5697,65 +5675,65 @@
       </return-value>
       <parameters>
         <parameter name="dir">
-          <type name="GDir" c:type="GDir*"/>
+          <type name="Dir" c:type="GDir*"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GFileError" c:type="GFileError">
-      <member name="r_exist" value="0" c:identifier="G_FILE_ERROR_EXIST"/>
-      <member name="r_isdir" value="1" c:identifier="G_FILE_ERROR_ISDIR"/>
-      <member name="r_acces" value="2" c:identifier="G_FILE_ERROR_ACCES"/>
-      <member name="r_nametoolong"
+    <enumeration name="FileError" c:type="GFileError">
+      <member name="rexist" value="0" c:identifier="G_FILE_ERROR_EXIST"/>
+      <member name="risdir" value="1" c:identifier="G_FILE_ERROR_ISDIR"/>
+      <member name="racces" value="2" c:identifier="G_FILE_ERROR_ACCES"/>
+      <member name="rnametoolong"
               value="3"
               c:identifier="G_FILE_ERROR_NAMETOOLONG"/>
-      <member name="r_noent" value="4" c:identifier="G_FILE_ERROR_NOENT"/>
-      <member name="r_notdir" value="5" c:identifier="G_FILE_ERROR_NOTDIR"/>
-      <member name="r_nxio" value="6" c:identifier="G_FILE_ERROR_NXIO"/>
-      <member name="r_nodev" value="7" c:identifier="G_FILE_ERROR_NODEV"/>
-      <member name="r_rofs" value="8" c:identifier="G_FILE_ERROR_ROFS"/>
-      <member name="r_txtbsy" value="9" c:identifier="G_FILE_ERROR_TXTBSY"/>
-      <member name="r_fault" value="10" c:identifier="G_FILE_ERROR_FAULT"/>
-      <member name="r_loop" value="11" c:identifier="G_FILE_ERROR_LOOP"/>
-      <member name="r_nospc" value="12" c:identifier="G_FILE_ERROR_NOSPC"/>
-      <member name="r_nomem" value="13" c:identifier="G_FILE_ERROR_NOMEM"/>
-      <member name="r_mfile" value="14" c:identifier="G_FILE_ERROR_MFILE"/>
-      <member name="r_nfile" value="15" c:identifier="G_FILE_ERROR_NFILE"/>
-      <member name="r_badf" value="16" c:identifier="G_FILE_ERROR_BADF"/>
-      <member name="r_inval" value="17" c:identifier="G_FILE_ERROR_INVAL"/>
-      <member name="r_pipe" value="18" c:identifier="G_FILE_ERROR_PIPE"/>
-      <member name="r_again" value="19" c:identifier="G_FILE_ERROR_AGAIN"/>
-      <member name="r_intr" value="20" c:identifier="G_FILE_ERROR_INTR"/>
-      <member name="r_io" value="21" c:identifier="G_FILE_ERROR_IO"/>
-      <member name="r_perm" value="22" c:identifier="G_FILE_ERROR_PERM"/>
-      <member name="r_nosys" value="23" c:identifier="G_FILE_ERROR_NOSYS"/>
-      <member name="r_failed" value="24" c:identifier="G_FILE_ERROR_FAILED"/>
+      <member name="rnoent" value="4" c:identifier="G_FILE_ERROR_NOENT"/>
+      <member name="rnotdir" value="5" c:identifier="G_FILE_ERROR_NOTDIR"/>
+      <member name="rnxio" value="6" c:identifier="G_FILE_ERROR_NXIO"/>
+      <member name="rnodev" value="7" c:identifier="G_FILE_ERROR_NODEV"/>
+      <member name="rrofs" value="8" c:identifier="G_FILE_ERROR_ROFS"/>
+      <member name="rtxtbsy" value="9" c:identifier="G_FILE_ERROR_TXTBSY"/>
+      <member name="rfault" value="10" c:identifier="G_FILE_ERROR_FAULT"/>
+      <member name="rloop" value="11" c:identifier="G_FILE_ERROR_LOOP"/>
+      <member name="rnospc" value="12" c:identifier="G_FILE_ERROR_NOSPC"/>
+      <member name="rnomem" value="13" c:identifier="G_FILE_ERROR_NOMEM"/>
+      <member name="rmfile" value="14" c:identifier="G_FILE_ERROR_MFILE"/>
+      <member name="rnfile" value="15" c:identifier="G_FILE_ERROR_NFILE"/>
+      <member name="rbadf" value="16" c:identifier="G_FILE_ERROR_BADF"/>
+      <member name="rinval" value="17" c:identifier="G_FILE_ERROR_INVAL"/>
+      <member name="rpipe" value="18" c:identifier="G_FILE_ERROR_PIPE"/>
+      <member name="ragain" value="19" c:identifier="G_FILE_ERROR_AGAIN"/>
+      <member name="rintr" value="20" c:identifier="G_FILE_ERROR_INTR"/>
+      <member name="rio" value="21" c:identifier="G_FILE_ERROR_IO"/>
+      <member name="rperm" value="22" c:identifier="G_FILE_ERROR_PERM"/>
+      <member name="rnosys" value="23" c:identifier="G_FILE_ERROR_NOSYS"/>
+      <member name="rfailed" value="24" c:identifier="G_FILE_ERROR_FAILED"/>
     </enumeration>
-    <enumeration name="GFileTest" c:type="GFileTest">
-      <member name="t_is_regular"
+    <enumeration name="FileTest" c:type="GFileTest">
+      <member name="tisregular"
               value="1"
               c:identifier="G_FILE_TEST_IS_REGULAR"/>
-      <member name="t_is_symlink"
+      <member name="tissymlink"
               value="2"
               c:identifier="G_FILE_TEST_IS_SYMLINK"/>
-      <member name="t_is_dir" value="4" c:identifier="G_FILE_TEST_IS_DIR"/>
-      <member name="t_is_executable"
+      <member name="tisdir" value="4" c:identifier="G_FILE_TEST_IS_DIR"/>
+      <member name="tisexecutable"
               value="8"
               c:identifier="G_FILE_TEST_IS_EXECUTABLE"/>
-      <member name="t_exists" value="16" c:identifier="G_FILE_TEST_EXISTS"/>
+      <member name="texists" value="16" c:identifier="G_FILE_TEST_EXISTS"/>
     </enumeration>
     <function name="file_error_quark" c:identifier="g_file_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <function name="file_error_from_errno"
               c:identifier="g_file_error_from_errno">
       <return-value>
-        <type name="GFileError" c:type="GFileError"/>
+        <type name="FileError" c:type="GFileError"/>
       </return-value>
       <parameters>
         <parameter name="err_no">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -5768,7 +5746,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="test">
-          <type name="GFileTest" c:type="GFileTest"/>
+          <type name="FileTest" c:type="GFileTest"/>
         </parameter>
       </parameters>
     </function>
@@ -5781,13 +5759,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="contents">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5806,7 +5784,7 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5819,13 +5797,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="mkstemp" c:identifier="g_mkstemp">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="tmpl">
@@ -5835,17 +5813,17 @@
     </function>
     <function name="file_open_tmp" c:identifier="g_file_open_tmp">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="tmpl">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="name_used">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -5856,7 +5834,7 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="goffset" c:type="goffset"/>
+          <type name="offset" c:type="goffset"/>
         </parameter>
       </parameters>
     </function>
@@ -5882,7 +5860,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="args">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -5902,7 +5880,7 @@
       </return-value>
       <parameters>
         <parameter name="args">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -5920,7 +5898,7 @@
       </parameters>
     </function>
     <record name="HashTable" c:type="GHashTable"/>
-    <callback name="GHRFunc">
+    <callback name="HRFunc" c:type="GHRFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -5936,8 +5914,7 @@
         </parameter>
       </parameters>
     </callback>
-    <record name="HashTableIter" c:type="GHashTableIter"/>
-    <record name="GHashTableIter" c:type="_GHashTableIter">
+    <record name="HashTableIter" c:type="GHashTableIter">
       <field name="dummy1">
         <type name="any" c:type="gpointer"/>
       </field>
@@ -5959,33 +5936,33 @@
     </record>
     <function name="hash_table_new" c:identifier="g_hash_table_new">
       <return-value>
-        <type name="GHashTable" c:type="GHashTable*"/>
+        <type name="HashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="hash_func">
-          <type name="GHashFunc" c:type="GHashFunc"/>
+          <type name="HashFunc" c:type="GHashFunc"/>
         </parameter>
         <parameter name="key_equal_func">
-          <type name="GEqualFunc" c:type="GEqualFunc"/>
+          <type name="EqualFunc" c:type="GEqualFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="hash_table_new_full" c:identifier="g_hash_table_new_full">
       <return-value>
-        <type name="GHashTable" c:type="GHashTable*"/>
+        <type name="HashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="hash_func">
-          <type name="GHashFunc" c:type="GHashFunc"/>
+          <type name="HashFunc" c:type="GHashFunc"/>
         </parameter>
         <parameter name="key_equal_func">
-          <type name="GEqualFunc" c:type="GEqualFunc"/>
+          <type name="EqualFunc" c:type="GEqualFunc"/>
         </parameter>
         <parameter name="key_destroy_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
         <parameter name="value_destroy_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -5995,7 +5972,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -6005,7 +5982,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gpointer"/>
@@ -6021,7 +5998,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gpointer"/>
@@ -6037,7 +6014,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
@@ -6051,7 +6028,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -6061,7 +6038,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
@@ -6075,7 +6052,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -6085,7 +6062,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
@@ -6099,16 +6076,16 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="lookup_key">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="orig_key">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
         <parameter name="value">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -6118,10 +6095,10 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="func">
-          <type name="GHFunc" c:type="GHFunc"/>
+          <type name="HFunc" c:type="GHFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6134,10 +6111,10 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="predicate">
-          <type name="GHRFunc" c:type="GHRFunc"/>
+          <type name="HRFunc" c:type="GHRFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6147,14 +6124,14 @@
     <function name="hash_table_foreach_remove"
               c:identifier="g_hash_table_foreach_remove">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="func">
-          <type name="GHRFunc" c:type="GHRFunc"/>
+          <type name="HRFunc" c:type="GHRFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6164,14 +6141,14 @@
     <function name="hash_table_foreach_steal"
               c:identifier="g_hash_table_foreach_steal">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
         <parameter name="func">
-          <type name="GHRFunc" c:type="GHRFunc"/>
+          <type name="HRFunc" c:type="GHRFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -6180,32 +6157,32 @@
     </function>
     <function name="hash_table_size" c:identifier="g_hash_table_size">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
     <function name="hash_table_get_keys" c:identifier="g_hash_table_get_keys">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
     <function name="hash_table_get_values"
               c:identifier="g_hash_table_get_values">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -6216,10 +6193,10 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GHashTableIter" c:type="GHashTableIter*"/>
+          <type name="HashTableIter" c:type="GHashTableIter*"/>
         </parameter>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -6230,24 +6207,24 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GHashTableIter" c:type="GHashTableIter*"/>
+          <type name="HashTableIter" c:type="GHashTableIter*"/>
         </parameter>
         <parameter name="key">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
         <parameter name="value">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
     <function name="hash_table_iter_get_hash_table"
               c:identifier="g_hash_table_iter_get_hash_table">
       <return-value>
-        <type name="GHashTable" c:type="GHashTable*"/>
+        <type name="HashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GHashTableIter" c:type="GHashTableIter*"/>
+          <type name="HashTableIter" c:type="GHashTableIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -6258,7 +6235,7 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GHashTableIter" c:type="GHashTableIter*"/>
+          <type name="HashTableIter" c:type="GHashTableIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -6269,17 +6246,17 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GHashTableIter" c:type="GHashTableIter*"/>
+          <type name="HashTableIter" c:type="GHashTableIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="hash_table_ref" c:identifier="g_hash_table_ref">
       <return-value>
-        <type name="GHashTable" c:type="GHashTable*"/>
+        <type name="HashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -6289,7 +6266,7 @@
       </return-value>
       <parameters>
         <parameter name="hash_table">
-          <type name="GHashTable" c:type="GHashTable*"/>
+          <type name="HashTable" c:type="GHashTable*"/>
         </parameter>
       </parameters>
     </function>
@@ -6308,7 +6285,7 @@
     </function>
     <function name="str_hash" c:identifier="g_str_hash">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="v">
@@ -6331,7 +6308,7 @@
     </function>
     <function name="int_hash" c:identifier="g_int_hash">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="v">
@@ -6341,7 +6318,7 @@
     </function>
     <function name="direct_hash" c:identifier="g_direct_hash">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="v">
@@ -6362,61 +6339,108 @@
         </parameter>
       </parameters>
     </function>
-    <record name="Hook" c:type="GHook"/>
-    <record name="HookList" c:type="GHookList"/>
-    <callback name="GHookCompareFunc">
+    <record name="Hook" c:type="GHook">
+      <field name="data">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="next">
+        <type name="Hook" c:type="GHook*"/>
+      </field>
+      <field name="prev">
+        <type name="Hook" c:type="GHook*"/>
+      </field>
+      <field name="ref_count">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="hook_id">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="flags">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="func">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="destroy">
+        <type name="DestroyNotify" c:type="GDestroyNotify"/>
+      </field>
+    </record>
+    <record name="HookList" c:type="GHookList">
+      <field name="seq_id">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="hook_size">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="is_setup">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="hooks">
+        <type name="Hook" c:type="GHook*"/>
+      </field>
+      <field name="dummy3">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="finalize_hook">
+        <type name="HookFinalizeFunc" c:type="GHookFinalizeFunc"/>
+      </field>
+      <field name="dummy">
+        <type name="any" c:type="gpointer"/>
+      </field>
+    </record>
+    <callback name="HookCompareFunc" c:type="GHookCompareFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="new_hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHookFindFunc">
+    <callback name="HookFindFunc" c:type="GHookFindFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHookMarshaller">
+    <callback name="HookMarshaller" c:type="GHookMarshaller">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHookCheckMarshaller">
+    <callback name="HookCheckMarshaller" c:type="GHookCheckMarshaller">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHookFunc">
+    <callback name="HookFunc" c:type="GHookFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -6426,7 +6450,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHookCheckFunc">
+    <callback name="HookCheckFunc" c:type="GHookCheckFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -6436,83 +6460,34 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GHookFinalizeFunc">
+    <callback name="HookFinalizeFunc" c:type="GHookFinalizeFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </callback>
-    <enumeration name="GHookFlagMask" c:type="GHookFlagMask">
+    <enumeration name="HookFlagMask" c:type="GHookFlagMask">
       <member name="active" value="1" c:identifier="G_HOOK_FLAG_ACTIVE"/>
-      <member name="in_call" value="2" c:identifier="G_HOOK_FLAG_IN_CALL"/>
+      <member name="incall" value="2" c:identifier="G_HOOK_FLAG_IN_CALL"/>
       <member name="k" value="15" c:identifier="G_HOOK_FLAG_MASK"/>
     </enumeration>
-    <record name="GHookList" c:type="_GHookList">
-      <field name="seq_id">
-        <type name="ulong" c:type="gulong"/>
-      </field>
-      <field name="hook_size">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="is_setup">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="hooks">
-        <type name="GHook" c:type="GHook*"/>
-      </field>
-      <field name="dummy3">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="finalize_hook">
-        <type name="GHookFinalizeFunc" c:type="GHookFinalizeFunc"/>
-      </field>
-      <field name="dummy">
-        <type name="any" c:type="gpointer"/>
-      </field>
-    </record>
-    <record name="GHook" c:type="_GHook">
-      <field name="data">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="next">
-        <type name="GHook" c:type="GHook*"/>
-      </field>
-      <field name="prev">
-        <type name="GHook" c:type="GHook*"/>
-      </field>
-      <field name="ref_count">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="hook_id">
-        <type name="ulong" c:type="gulong"/>
-      </field>
-      <field name="flags">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="func">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="destroy">
-        <type name="GDestroyNotify" c:type="GDestroyNotify"/>
-      </field>
-    </record>
     <function name="hook_list_init" c:identifier="g_hook_list_init">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -6522,17 +6497,17 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="hook_alloc" c:identifier="g_hook_alloc">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
       </parameters>
     </function>
@@ -6542,23 +6517,23 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </function>
     <function name="hook_ref" c:identifier="g_hook_ref">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </function>
@@ -6568,10 +6543,10 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </function>
@@ -6581,7 +6556,7 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook_id">
           <type name="ulong" c:type="gulong"/>
@@ -6594,10 +6569,10 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </function>
@@ -6607,10 +6582,10 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </function>
@@ -6620,13 +6595,13 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </function>
@@ -6636,23 +6611,23 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="func">
-          <type name="GHookCompareFunc" c:type="GHookCompareFunc"/>
+          <type name="HookCompareFunc" c:type="GHookCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="hook_get" c:identifier="g_hook_get">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook_id">
           <type name="ulong" c:type="gulong"/>
@@ -6661,17 +6636,17 @@
     </function>
     <function name="hook_find" c:identifier="g_hook_find">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="need_valids">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="func">
-          <type name="GHookFindFunc" c:type="GHookFindFunc"/>
+          <type name="HookFindFunc" c:type="GHookFindFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -6680,11 +6655,11 @@
     </function>
     <function name="hook_find_data" c:identifier="g_hook_find_data">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="need_valids">
           <type name="boolean" c:type="gboolean"/>
@@ -6696,11 +6671,11 @@
     </function>
     <function name="hook_find_func" c:identifier="g_hook_find_func">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="need_valids">
           <type name="boolean" c:type="gboolean"/>
@@ -6712,11 +6687,11 @@
     </function>
     <function name="hook_find_func_data" c:identifier="g_hook_find_func_data">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="need_valids">
           <type name="boolean" c:type="gboolean"/>
@@ -6731,11 +6706,11 @@
     </function>
     <function name="hook_first_valid" c:identifier="g_hook_first_valid">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="may_be_in_call">
           <type name="boolean" c:type="gboolean"/>
@@ -6744,14 +6719,14 @@
     </function>
     <function name="hook_next_valid" c:identifier="g_hook_next_valid">
       <return-value>
-        <type name="GHook" c:type="GHook*"/>
+        <type name="Hook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="may_be_in_call">
           <type name="boolean" c:type="gboolean"/>
@@ -6760,14 +6735,14 @@
     </function>
     <function name="hook_compare_ids" c:identifier="g_hook_compare_ids">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="new_hook">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GHook" c:type="GHook*"/>
+          <type name="Hook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </function>
@@ -6777,7 +6752,7 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="may_recurse">
           <type name="boolean" c:type="gboolean"/>
@@ -6791,7 +6766,7 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="may_recurse">
           <type name="boolean" c:type="gboolean"/>
@@ -6804,13 +6779,13 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="may_recurse">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="marshaller">
-          <type name="GHookMarshaller" c:type="GHookMarshaller"/>
+          <type name="HookMarshaller" c:type="GHookMarshaller"/>
         </parameter>
         <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
@@ -6824,20 +6799,20 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList" c:type="GHookList*"/>
+          <type name="HookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="may_recurse">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="marshaller">
-          <type name="GHookCheckMarshaller" c:type="GHookCheckMarshaller"/>
+          <type name="HookCheckMarshaller" c:type="GHookCheckMarshaller"/>
         </parameter>
         <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GAsciiType" c:type="GAsciiType">
+    <enumeration name="AsciiType" c:type="GAsciiType">
       <member name="alnum" value="1" c:identifier="G_ASCII_ALNUM"/>
       <member name="alpha" value="2" c:identifier="G_ASCII_ALPHA"/>
       <member name="cntrl" value="4" c:identifier="G_ASCII_CNTRL"/>
@@ -6852,41 +6827,41 @@
     </enumeration>
     <function name="ascii_tolower" c:identifier="g_ascii_tolower">
       <return-value>
-        <type name="gchar" c:type="gchar"/>
+        <type name="char" c:type="gchar"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
     <function name="ascii_toupper" c:identifier="g_ascii_toupper">
       <return-value>
-        <type name="gchar" c:type="gchar"/>
+        <type name="char" c:type="gchar"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
     <function name="ascii_digit_value" c:identifier="g_ascii_digit_value">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
     <function name="ascii_xdigit_value" c:identifier="g_ascii_xdigit_value">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6902,7 +6877,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="new_delimiter">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6918,7 +6893,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="substitutor">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6928,7 +6903,7 @@
       </return-value>
       <parameters>
         <parameter name="errnum">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6938,7 +6913,7 @@
       </return-value>
       <parameters>
         <parameter name="signum">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -7064,7 +7039,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7077,39 +7052,39 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
     <function name="ascii_strtoull" c:identifier="g_ascii_strtoull">
       <return-value>
-        <type name="guint64" c:type="guint64"/>
+        <type name="uint64" c:type="guint64"/>
       </return-value>
       <parameters>
         <parameter name="nptr">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="base">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="ascii_strtoll" c:identifier="g_ascii_strtoll">
       <return-value>
-        <type name="gint64" c:type="gint64"/>
+        <type name="int64" c:type="gint64"/>
       </return-value>
       <parameters>
         <parameter name="nptr">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="base">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -7122,7 +7097,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="buf_len">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="d">
           <type name="double" c:type="gdouble"/>
@@ -7138,7 +7113,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="buf_len">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -7170,7 +7145,7 @@
     </function>
     <function name="ascii_strcasecmp" c:identifier="g_ascii_strcasecmp">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="s1">
@@ -7183,7 +7158,7 @@
     </function>
     <function name="ascii_strncasecmp" c:identifier="g_ascii_strncasecmp">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="s1">
@@ -7225,7 +7200,7 @@
     </function>
     <function name="strcasecmp" c:identifier="g_strcasecmp">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="s1">
@@ -7238,7 +7213,7 @@
     </function>
     <function name="strncasecmp" c:identifier="g_strncasecmp">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="s1">
@@ -7248,7 +7223,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -7314,7 +7289,7 @@
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="fill_char">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -7370,13 +7345,13 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="byte_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="strsplit" c:identifier="g_strsplit">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -7386,13 +7361,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="max_tokens">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="strsplit_set" c:identifier="g_strsplit_set">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -7402,7 +7377,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="max_tokens">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -7415,7 +7390,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="str_array">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7425,27 +7400,27 @@
       </return-value>
       <parameters>
         <parameter name="str_array">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
     <function name="strdupv" c:identifier="g_strdupv">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="str_array">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
     <function name="strv_length" c:identifier="g_strv_length">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="str_array">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7491,18 +7466,17 @@
         </parameter>
       </parameters>
     </function>
-    <record name="SList" c:type="GSList"/>
-    <record name="GSList" c:type="_GSList">
+    <record name="SList" c:type="GSList">
       <field name="data">
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="next">
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </field>
     </record>
     <function name="slist_alloc" c:identifier="g_slist_alloc">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
     </function>
     <function name="slist_free" c:identifier="g_slist_free">
@@ -7511,7 +7485,7 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
@@ -7521,17 +7495,17 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_append" c:identifier="g_slist_append">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -7540,11 +7514,11 @@
     </function>
     <function name="slist_prepend" c:identifier="g_slist_prepend">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -7553,50 +7527,50 @@
     </function>
     <function name="slist_insert" c:identifier="g_slist_insert">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_insert_sorted" c:identifier="g_slist_insert_sorted">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_insert_sorted_with_data"
               c:identifier="g_slist_insert_sorted_with_data">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7605,14 +7579,14 @@
     </function>
     <function name="slist_insert_before" c:identifier="g_slist_insert_before">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="slist">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -7621,24 +7595,24 @@
     </function>
     <function name="slist_concat" c:identifier="g_slist_concat">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list1">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="list2">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_remove" c:identifier="g_slist_remove">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -7647,11 +7621,11 @@
     </function>
     <function name="slist_remove_all" c:identifier="g_slist_remove_all">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -7660,70 +7634,70 @@
     </function>
     <function name="slist_remove_link" c:identifier="g_slist_remove_link">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_delete_link" c:identifier="g_slist_delete_link">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_reverse" c:identifier="g_slist_reverse">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_copy" c:identifier="g_slist_copy">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_nth" c:identifier="g_slist_nth">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_find" c:identifier="g_slist_find">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -7732,40 +7706,40 @@
     </function>
     <function name="slist_find_custom" c:identifier="g_slist_find_custom">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_position" c:identifier="g_slist_position">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="llink">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_index" c:identifier="g_slist_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -7774,21 +7748,21 @@
     </function>
     <function name="slist_last" c:identifier="g_slist_last">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_length" c:identifier="g_slist_length">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
@@ -7798,10 +7772,10 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7810,28 +7784,28 @@
     </function>
     <function name="slist_sort" c:identifier="g_slist_sort">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="slist_sort_with_data"
               c:identifier="g_slist_sort_with_data">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -7844,10 +7818,10 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="SList" c:type="GSList*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -7869,68 +7843,39 @@
     </function>
     <record name="MainContext" c:type="GMainContext"/>
     <record name="MainLoop" c:type="GMainLoop"/>
-    <record name="Source" c:type="GSource"/>
-    <record name="SourceCallbackFuncs" c:type="GSourceCallbackFuncs"/>
-    <record name="SourceFuncs" c:type="GSourceFuncs"/>
-    <callback name="GSourceFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GChildWatchFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pid">
-          <type name="GPid" c:type="GPid"/>
-        </parameter>
-        <parameter name="status">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GSource" c:type="_GSource">
+    <record name="Source" c:type="GSource">
       <field name="callback_data">
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="callback_funcs">
-        <type name="GSourceCallbackFuncs" c:type="GSourceCallbackFuncs*"/>
+        <type name="SourceCallbackFuncs" c:type="GSourceCallbackFuncs*"/>
       </field>
       <field name="source_funcs">
-        <type name="GSourceFuncs" c:type="GSourceFuncs*"/>
+        <type name="SourceFuncs" c:type="GSourceFuncs*"/>
       </field>
       <field name="ref_count">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="context">
-        <type name="GMainContext" c:type="GMainContext*"/>
+        <type name="MainContext" c:type="GMainContext*"/>
       </field>
       <field name="priority">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </field>
       <field name="flags">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="source_id">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="poll_fds">
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </field>
       <field name="prev">
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </field>
       <field name="next">
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </field>
       <field name="reserved1">
         <type name="any" c:type="gpointer"/>
@@ -7939,8 +7884,8 @@
         <type name="any" c:type="gpointer"/>
       </field>
     </record>
-    <record name="GSourceCallbackFuncs" c:type="_GSourceCallbackFuncs">
-      <callback name="ref">
+    <record name="SourceCallbackFuncs" c:type="GSourceCallbackFuncs">
+      <callback name="ref" c:type="ref">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7950,7 +7895,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="unref">
+      <callback name="unref" c:type="unref">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7960,7 +7905,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get">
+      <callback name="et" c:type="get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7969,119 +7914,144 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="source">
-            <type name="GSource" c:type="GSource*"/>
+            <type name="Source" c:type="GSource*"/>
           </parameter>
           <parameter name="func">
-            <type name="GSourceFunc" c:type="GSourceFunc*"/>
+            <type name="SourceFunc" c:type="GSourceFunc*"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer*"/>
+            <type name="pointer" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
     </record>
-    <callback name="GSourceDummyMarshal">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </callback>
-    <record name="GSourceFuncs" c:type="_GSourceFuncs">
-      <callback name="prepare">
+    <record name="SourceFuncs" c:type="GSourceFuncs">
+      <callback name="prepare" c:type="prepare">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource" c:type="GSource*"/>
+            <type name="Source" c:type="GSource*"/>
           </parameter>
           <parameter name="timeout_">
-            <type name="gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="check">
+      <callback name="check" c:type="check">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource" c:type="GSource*"/>
+            <type name="Source" c:type="GSource*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="dispatch">
+      <callback name="dispatch" c:type="dispatch">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource" c:type="GSource*"/>
+            <type name="Source" c:type="GSource*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GSourceFunc" c:type="GSourceFunc"/>
+            <type name="SourceFunc" c:type="GSourceFunc"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="finalize">
+      <callback name="finalize" c:type="finalize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource" c:type="GSource*"/>
+            <type name="Source" c:type="GSource*"/>
           </parameter>
         </parameters>
       </callback>
       <field name="closure_callback">
-        <type name="GSourceFunc" c:type="GSourceFunc"/>
+        <type name="SourceFunc" c:type="GSourceFunc"/>
       </field>
       <field name="closure_marshal">
-        <type name="GSourceDummyMarshal" c:type="GSourceDummyMarshal"/>
+        <type name="SourceDummyMarshal" c:type="GSourceDummyMarshal"/>
       </field>
     </record>
-    <record name="PollFD" c:type="GPollFD"/>
-    <callback name="GPollFunc">
+    <callback name="SourceFunc" c:type="GSourceFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ufds">
-          <type name="GPollFD" c:type="GPollFD*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="nfsd">
-          <type name="uint32" c:type="guint"/>
+      </parameters>
+    </callback>
+    <callback name="ChildWatchFunc" c:type="GChildWatchFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="pid">
+          <type name="Pid" c:type="GPid"/>
         </parameter>
-        <parameter name="timeout_">
-          <type name="int32" c:type="gint"/>
+        <parameter name="status">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <record name="GPollFD" c:type="_GPollFD">
+    <callback name="SourceDummyMarshal" c:type="GSourceDummyMarshal">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </callback>
+    <record name="PollFD" c:type="GPollFD">
       <field name="fd">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </field>
       <field name="events">
-        <type name="gushort" c:type="gushort"/>
+        <type name="ushort" c:type="gushort"/>
       </field>
       <field name="revents">
-        <type name="gushort" c:type="gushort"/>
+        <type name="ushort" c:type="gushort"/>
       </field>
     </record>
+    <callback name="PollFunc" c:type="GPollFunc">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="ufds">
+          <type name="PollFD" c:type="GPollFD*"/>
+        </parameter>
+        <parameter name="nfsd">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="timeout_">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </callback>
     <function name="main_context_new" c:identifier="g_main_context_new">
       <return-value>
-        <type name="GMainContext" c:type="GMainContext*"/>
+        <type name="MainContext" c:type="GMainContext*"/>
       </return-value>
     </function>
     <function name="main_context_ref" c:identifier="g_main_context_ref">
       <return-value>
-        <type name="GMainContext" c:type="GMainContext*"/>
+        <type name="MainContext" c:type="GMainContext*"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8091,14 +8061,14 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_context_default"
               c:identifier="g_main_context_default">
       <return-value>
-        <type name="GMainContext" c:type="GMainContext*"/>
+        <type name="MainContext" c:type="GMainContext*"/>
       </return-value>
     </function>
     <function name="main_context_iteration"
@@ -8108,7 +8078,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="may_block">
           <type name="boolean" c:type="gboolean"/>
@@ -8122,32 +8092,32 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_context_find_source_by_id"
               c:identifier="g_main_context_find_source_by_id">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="source_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_context_find_source_by_user_data"
               c:identifier="g_main_context_find_source_by_user_data">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -8157,14 +8127,14 @@
     <function name="main_context_find_source_by_funcs_user_data"
               c:identifier="g_main_context_find_source_by_funcs_user_data">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="funcs">
-          <type name="GSourceFuncs" c:type="GSourceFuncs*"/>
+          <type name="SourceFuncs" c:type="GSourceFuncs*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -8177,7 +8147,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8188,7 +8158,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8199,7 +8169,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8210,7 +8180,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8220,13 +8190,13 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="cond">
-          <type name="GCond" c:type="GCond*"/>
+          <type name="Cond" c:type="GCond*"/>
         </parameter>
         <parameter name="mutex">
-          <type name="GMutex" c:type="GMutex*"/>
+          <type name="Mutex" c:type="GMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -8237,51 +8207,51 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="priority">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_context_query" c:identifier="g_main_context_query">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="max_priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="timeout_">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="fds">
-          <type name="GPollFD" c:type="GPollFD*"/>
+          <type name="PollFD" c:type="GPollFD*"/>
         </parameter>
         <parameter name="n_fds">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_context_check" c:identifier="g_main_context_check">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="max_priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="fds">
-          <type name="GPollFD" c:type="GPollFD*"/>
+          <type name="PollFD" c:type="GPollFD*"/>
         </parameter>
         <parameter name="n_fds">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -8292,7 +8262,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8303,21 +8273,21 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="func">
-          <type name="GPollFunc" c:type="GPollFunc"/>
+          <type name="PollFunc" c:type="GPollFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_context_get_poll_func"
               c:identifier="g_main_context_get_poll_func">
       <return-value>
-        <type name="GPollFunc" c:type="GPollFunc"/>
+        <type name="PollFunc" c:type="GPollFunc"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8328,13 +8298,13 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="fd">
-          <type name="GPollFD" c:type="GPollFD*"/>
+          <type name="PollFD" c:type="GPollFD*"/>
         </parameter>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -8345,30 +8315,30 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="fd">
-          <type name="GPollFD" c:type="GPollFD*"/>
+          <type name="PollFD" c:type="GPollFD*"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_depth" c:identifier="g_main_depth">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
     </function>
     <function name="main_current_source" c:identifier="g_main_current_source">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
     </function>
     <function name="main_loop_new" c:identifier="g_main_loop_new">
       <return-value>
-        <type name="GMainLoop" c:type="GMainLoop*"/>
+        <type name="MainLoop" c:type="GMainLoop*"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
         <parameter name="is_running">
           <type name="boolean" c:type="gboolean"/>
@@ -8381,7 +8351,7 @@
       </return-value>
       <parameters>
         <parameter name="loop">
-          <type name="GMainLoop" c:type="GMainLoop*"/>
+          <type name="MainLoop" c:type="GMainLoop*"/>
         </parameter>
       </parameters>
     </function>
@@ -8391,17 +8361,17 @@
       </return-value>
       <parameters>
         <parameter name="loop">
-          <type name="GMainLoop" c:type="GMainLoop*"/>
+          <type name="MainLoop" c:type="GMainLoop*"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_loop_ref" c:identifier="g_main_loop_ref">
       <return-value>
-        <type name="GMainLoop" c:type="GMainLoop*"/>
+        <type name="MainLoop" c:type="GMainLoop*"/>
       </return-value>
       <parameters>
         <parameter name="loop">
-          <type name="GMainLoop" c:type="GMainLoop*"/>
+          <type name="MainLoop" c:type="GMainLoop*"/>
         </parameter>
       </parameters>
     </function>
@@ -8411,7 +8381,7 @@
       </return-value>
       <parameters>
         <parameter name="loop">
-          <type name="GMainLoop" c:type="GMainLoop*"/>
+          <type name="MainLoop" c:type="GMainLoop*"/>
         </parameter>
       </parameters>
     </function>
@@ -8422,41 +8392,41 @@
       </return-value>
       <parameters>
         <parameter name="loop">
-          <type name="GMainLoop" c:type="GMainLoop*"/>
+          <type name="MainLoop" c:type="GMainLoop*"/>
         </parameter>
       </parameters>
     </function>
     <function name="main_loop_get_context"
               c:identifier="g_main_loop_get_context">
       <return-value>
-        <type name="GMainContext" c:type="GMainContext*"/>
+        <type name="MainContext" c:type="GMainContext*"/>
       </return-value>
       <parameters>
         <parameter name="loop">
-          <type name="GMainLoop" c:type="GMainLoop*"/>
+          <type name="MainLoop" c:type="GMainLoop*"/>
         </parameter>
       </parameters>
     </function>
     <function name="source_new" c:identifier="g_source_new">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="source_funcs">
-          <type name="GSourceFuncs" c:type="GSourceFuncs*"/>
+          <type name="SourceFuncs" c:type="GSourceFuncs*"/>
         </parameter>
         <parameter name="struct_size">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="source_ref" c:identifier="g_source_ref">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
@@ -8466,20 +8436,20 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
     <function name="source_attach" c:identifier="g_source_attach">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="context">
-          <type name="GMainContext" c:type="GMainContext*"/>
+          <type name="MainContext" c:type="GMainContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -8489,7 +8459,7 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
@@ -8499,20 +8469,20 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="source_get_priority" c:identifier="g_source_get_priority">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
@@ -8523,7 +8493,7 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="can_recurse">
           <type name="boolean" c:type="gboolean"/>
@@ -8537,27 +8507,27 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
     <function name="source_get_id" c:identifier="g_source_get_id">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
     <function name="source_get_context" c:identifier="g_source_get_context">
       <return-value>
-        <type name="GMainContext" c:type="GMainContext*"/>
+        <type name="MainContext" c:type="GMainContext*"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
@@ -8567,16 +8537,16 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="func">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="SourceFunc" 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="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -8586,10 +8556,10 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="funcs">
-          <type name="GSourceFuncs" c:type="GSourceFuncs*"/>
+          <type name="SourceFuncs" c:type="GSourceFuncs*"/>
         </parameter>
       </parameters>
     </function>
@@ -8599,7 +8569,7 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
       </parameters>
     </function>
@@ -8610,13 +8580,13 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="callback_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="callback_funcs">
-          <type name="GSourceCallbackFuncs" c:type="GSourceCallbackFuncs*"/>
+          <type name="SourceCallbackFuncs" c:type="GSourceCallbackFuncs*"/>
         </parameter>
       </parameters>
     </function>
@@ -8626,10 +8596,10 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="fd">
-          <type name="GPollFD" c:type="GPollFD*"/>
+          <type name="PollFD" c:type="GPollFD*"/>
         </parameter>
       </parameters>
     </function>
@@ -8639,10 +8609,10 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="fd">
-          <type name="GPollFD" c:type="GPollFD*"/>
+          <type name="PollFD" c:type="GPollFD*"/>
         </parameter>
       </parameters>
     </function>
@@ -8653,57 +8623,57 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </parameter>
         <parameter name="timeval">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
       </parameters>
     </function>
     <function name="idle_source_new" c:identifier="g_idle_source_new">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
     </function>
     <function name="child_watch_source_new"
               c:identifier="g_child_watch_source_new">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="pid">
-          <type name="GPid" c:type="GPid"/>
+          <type name="Pid" c:type="GPid"/>
         </parameter>
       </parameters>
     </function>
     <function name="timeout_source_new" c:identifier="g_timeout_source_new">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="interval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="timeout_source_new_seconds"
               c:identifier="g_timeout_source_new_seconds">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="interval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="get_current_time" c:identifier="g_get_current_time">
+    <function name="et_current_time" c:identifier="g_get_current_time">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="result">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
       </parameters>
     </function>
@@ -8713,7 +8683,7 @@
       </return-value>
       <parameters>
         <parameter name="tag">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -8735,7 +8705,7 @@
       </return-value>
       <parameters>
         <parameter name="funcs">
-          <type name="GSourceFuncs" c:type="GSourceFuncs*"/>
+          <type name="SourceFuncs" c:type="GSourceFuncs*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -8744,36 +8714,36 @@
     </function>
     <function name="timeout_add_full" c:identifier="g_timeout_add_full">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="interval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="SourceFunc" 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="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <function name="timeout_add" c:identifier="g_timeout_add">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="interval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="SourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -8783,36 +8753,36 @@
     <function name="timeout_add_seconds_full"
               c:identifier="g_timeout_add_seconds_full">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="interval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="SourceFunc" 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="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <function name="timeout_add_seconds" c:identifier="g_timeout_add_seconds">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="interval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="SourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -8822,36 +8792,36 @@
     <function name="child_watch_add_full"
               c:identifier="g_child_watch_add_full">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="pid">
-          <type name="GPid" c:type="GPid"/>
+          <type name="Pid" c:type="GPid"/>
         </parameter>
         <parameter name="function">
-          <type name="GChildWatchFunc" c:type="GChildWatchFunc"/>
+          <type name="ChildWatchFunc" c:type="GChildWatchFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <function name="child_watch_add" c:identifier="g_child_watch_add">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="pid">
-          <type name="GPid" c:type="GPid"/>
+          <type name="Pid" c:type="GPid"/>
         </parameter>
         <parameter name="function">
-          <type name="GChildWatchFunc" c:type="GChildWatchFunc"/>
+          <type name="ChildWatchFunc" c:type="GChildWatchFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -8860,11 +8830,11 @@
     </function>
     <function name="idle_add" c:identifier="g_idle_add">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="SourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -8873,20 +8843,20 @@
     </function>
     <function name="idle_add_full" c:identifier="g_idle_add_full">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="SourceFunc" 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="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -8900,113 +8870,113 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GUnicodeType" c:type="GUnicodeType">
+    <enumeration name="UnicodeType" c:type="GUnicodeType">
       <member name="control" value="0" c:identifier="G_UNICODE_CONTROL"/>
       <member name="format" value="1" c:identifier="G_UNICODE_FORMAT"/>
       <member name="unassigned" value="2" c:identifier="G_UNICODE_UNASSIGNED"/>
-      <member name="private_use"
+      <member name="privateuse"
               value="3"
               c:identifier="G_UNICODE_PRIVATE_USE"/>
       <member name="surrogate" value="4" c:identifier="G_UNICODE_SURROGATE"/>
-      <member name="lowercase_letter"
+      <member name="lowercaseletter"
               value="5"
               c:identifier="G_UNICODE_LOWERCASE_LETTER"/>
-      <member name="modifier_letter"
+      <member name="modifierletter"
               value="6"
               c:identifier="G_UNICODE_MODIFIER_LETTER"/>
-      <member name="other_letter"
+      <member name="otherletter"
               value="7"
               c:identifier="G_UNICODE_OTHER_LETTER"/>
-      <member name="itlecase_letter"
+      <member name="itlecaseletter"
               value="8"
               c:identifier="G_UNICODE_TITLECASE_LETTER"/>
-      <member name="uppercase_letter"
+      <member name="uppercaseletter"
               value="9"
               c:identifier="G_UNICODE_UPPERCASE_LETTER"/>
-      <member name="combining_mark"
+      <member name="combiningmark"
               value="10"
               c:identifier="G_UNICODE_COMBINING_MARK"/>
-      <member name="enclosing_mark"
+      <member name="enclosingmark"
               value="11"
               c:identifier="G_UNICODE_ENCLOSING_MARK"/>
-      <member name="non_spacing_mark"
+      <member name="nonspacingmark"
               value="12"
               c:identifier="G_UNICODE_NON_SPACING_MARK"/>
-      <member name="decimal_number"
+      <member name="decimalnumber"
               value="13"
               c:identifier="G_UNICODE_DECIMAL_NUMBER"/>
-      <member name="letter_number"
+      <member name="letternumber"
               value="14"
               c:identifier="G_UNICODE_LETTER_NUMBER"/>
-      <member name="other_number"
+      <member name="othernumber"
               value="15"
               c:identifier="G_UNICODE_OTHER_NUMBER"/>
-      <member name="connect_punctuation"
+      <member name="connectpunctuation"
               value="16"
               c:identifier="G_UNICODE_CONNECT_PUNCTUATION"/>
-      <member name="dash_punctuation"
+      <member name="dashpunctuation"
               value="17"
               c:identifier="G_UNICODE_DASH_PUNCTUATION"/>
-      <member name="close_punctuation"
+      <member name="closepunctuation"
               value="18"
               c:identifier="G_UNICODE_CLOSE_PUNCTUATION"/>
-      <member name="final_punctuation"
+      <member name="finalpunctuation"
               value="19"
               c:identifier="G_UNICODE_FINAL_PUNCTUATION"/>
-      <member name="initial_punctuation"
+      <member name="initialpunctuation"
               value="20"
               c:identifier="G_UNICODE_INITIAL_PUNCTUATION"/>
-      <member name="other_punctuation"
+      <member name="otherpunctuation"
               value="21"
               c:identifier="G_UNICODE_OTHER_PUNCTUATION"/>
-      <member name="open_punctuation"
+      <member name="openpunctuation"
               value="22"
               c:identifier="G_UNICODE_OPEN_PUNCTUATION"/>
-      <member name="currency_symbol"
+      <member name="currencysymbol"
               value="23"
               c:identifier="G_UNICODE_CURRENCY_SYMBOL"/>
-      <member name="modifier_symbol"
+      <member name="modifiersymbol"
               value="24"
               c:identifier="G_UNICODE_MODIFIER_SYMBOL"/>
-      <member name="math_symbol"
+      <member name="mathsymbol"
               value="25"
               c:identifier="G_UNICODE_MATH_SYMBOL"/>
-      <member name="other_symbol"
+      <member name="othersymbol"
               value="26"
               c:identifier="G_UNICODE_OTHER_SYMBOL"/>
-      <member name="line_separator"
+      <member name="lineseparator"
               value="27"
               c:identifier="G_UNICODE_LINE_SEPARATOR"/>
-      <member name="paragraph_separator"
+      <member name="paragraphseparator"
               value="28"
               c:identifier="G_UNICODE_PARAGRAPH_SEPARATOR"/>
-      <member name="space_separator"
+      <member name="spaceseparator"
               value="29"
               c:identifier="G_UNICODE_SPACE_SEPARATOR"/>
     </enumeration>
-    <enumeration name="GUnicodeBreakType" c:type="GUnicodeBreakType">
+    <enumeration name="UnicodeBreakType" c:type="GUnicodeBreakType">
       <member name="mandatory"
               value="0"
               c:identifier="G_UNICODE_BREAK_MANDATORY"/>
-      <member name="carriage_return"
+      <member name="carriagereturn"
               value="1"
               c:identifier="G_UNICODE_BREAK_CARRIAGE_RETURN"/>
-      <member name="line_feed"
+      <member name="linefeed"
               value="2"
               c:identifier="G_UNICODE_BREAK_LINE_FEED"/>
-      <member name="combining_mark"
+      <member name="combiningmark"
               value="3"
               c:identifier="G_UNICODE_BREAK_COMBINING_MARK"/>
       <member name="surrogate"
               value="4"
               c:identifier="G_UNICODE_BREAK_SURROGATE"/>
-      <member name="zero_width_space"
+      <member name="zerowidthspace"
               value="5"
               c:identifier="G_UNICODE_BREAK_ZERO_WIDTH_SPACE"/>
       <member name="inseparable"
               value="6"
               c:identifier="G_UNICODE_BREAK_INSEPARABLE"/>
-      <member name="non_breaking_glue"
+      <member name="nonbreakingglue"
               value="7"
               c:identifier="G_UNICODE_BREAK_NON_BREAKING_GLUE"/>
       <member name="contingent"
@@ -9015,17 +8985,17 @@
       <member name="space" value="9" c:identifier="G_UNICODE_BREAK_SPACE"/>
       <member name="after" value="10" c:identifier="G_UNICODE_BREAK_AFTER"/>
       <member name="before" value="11" c:identifier="G_UNICODE_BREAK_BEFORE"/>
-      <member name="before_and_after"
+      <member name="beforeandafter"
               value="12"
               c:identifier="G_UNICODE_BREAK_BEFORE_AND_AFTER"/>
       <member name="hyphen" value="13" c:identifier="G_UNICODE_BREAK_HYPHEN"/>
-      <member name="non_starter"
+      <member name="nonstarter"
               value="14"
               c:identifier="G_UNICODE_BREAK_NON_STARTER"/>
-      <member name="open_punctuation"
+      <member name="openpunctuation"
               value="15"
               c:identifier="G_UNICODE_BREAK_OPEN_PUNCTUATION"/>
-      <member name="close_punctuation"
+      <member name="closepunctuation"
               value="16"
               c:identifier="G_UNICODE_BREAK_CLOSE_PUNCTUATION"/>
       <member name="quotation"
@@ -9040,7 +9010,7 @@
       <member name="numeric"
               value="20"
               c:identifier="G_UNICODE_BREAK_NUMERIC"/>
-      <member name="infix_separator"
+      <member name="infixseparator"
               value="21"
               c:identifier="G_UNICODE_BREAK_INFIX_SEPARATOR"/>
       <member name="symbol" value="22" c:identifier="G_UNICODE_BREAK_SYMBOL"/>
@@ -9051,7 +9021,7 @@
       <member name="postfix"
               value="25"
               c:identifier="G_UNICODE_BREAK_POSTFIX"/>
-      <member name="complex_context"
+      <member name="complexcontext"
               value="26"
               c:identifier="G_UNICODE_BREAK_COMPLEX_CONTEXT"/>
       <member name="ambiguous"
@@ -9060,236 +9030,228 @@
       <member name="unknown"
               value="28"
               c:identifier="G_UNICODE_BREAK_UNKNOWN"/>
-      <member name="next_line"
+      <member name="nextline"
               value="29"
               c:identifier="G_UNICODE_BREAK_NEXT_LINE"/>
-      <member name="word_joiner"
+      <member name="wordjoiner"
               value="30"
               c:identifier="G_UNICODE_BREAK_WORD_JOINER"/>
-      <member name="hangul_l_jamo"
+      <member name="hangulljamo"
               value="31"
               c:identifier="G_UNICODE_BREAK_HANGUL_L_JAMO"/>
-      <member name="hangul_v_jamo"
+      <member name="hangulvjamo"
               value="32"
               c:identifier="G_UNICODE_BREAK_HANGUL_V_JAMO"/>
-      <member name="hangul_t_jamo"
+      <member name="hangultjamo"
               value="33"
               c:identifier="G_UNICODE_BREAK_HANGUL_T_JAMO"/>
-      <member name="hangul_lv_syllable"
+      <member name="hangullvsyllable"
               value="34"
               c:identifier="G_UNICODE_BREAK_HANGUL_LV_SYLLABLE"/>
-      <member name="hangul_lvt_syllable"
+      <member name="hangullvtsyllable"
               value="35"
               c:identifier="G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE"/>
     </enumeration>
-    <enumeration name="GUnicodeScript" c:type="GUnicodeScript">
-      <member name="t_invalid_code"
+    <enumeration name="UnicodeScript" c:type="GUnicodeScript">
+      <member name="tinvalidcode"
               value="-1"
               c:identifier="G_UNICODE_SCRIPT_INVALID_CODE"/>
-      <member name="t_common"
-              value="0"
-              c:identifier="G_UNICODE_SCRIPT_COMMON"/>
-      <member name="t_inherited"
+      <member name="tcommon" value="0" c:identifier="G_UNICODE_SCRIPT_COMMON"/>
+      <member name="tinherited"
               value="1"
               c:identifier="G_UNICODE_SCRIPT_INHERITED"/>
-      <member name="t_arabic"
-              value="2"
-              c:identifier="G_UNICODE_SCRIPT_ARABIC"/>
-      <member name="t_armenian"
+      <member name="tarabic" value="2" c:identifier="G_UNICODE_SCRIPT_ARABIC"/>
+      <member name="tarmenian"
               value="3"
               c:identifier="G_UNICODE_SCRIPT_ARMENIAN"/>
-      <member name="t_bengali"
+      <member name="tbengali"
               value="4"
               c:identifier="G_UNICODE_SCRIPT_BENGALI"/>
-      <member name="t_bopomofo"
+      <member name="tbopomofo"
               value="5"
               c:identifier="G_UNICODE_SCRIPT_BOPOMOFO"/>
-      <member name="t_cherokee"
+      <member name="tcherokee"
               value="6"
               c:identifier="G_UNICODE_SCRIPT_CHEROKEE"/>
-      <member name="t_coptic"
-              value="7"
-              c:identifier="G_UNICODE_SCRIPT_COPTIC"/>
-      <member name="t_cyrillic"
+      <member name="tcoptic" value="7" c:identifier="G_UNICODE_SCRIPT_COPTIC"/>
+      <member name="tcyrillic"
               value="8"
               c:identifier="G_UNICODE_SCRIPT_CYRILLIC"/>
-      <member name="t_deseret"
+      <member name="tdeseret"
               value="9"
               c:identifier="G_UNICODE_SCRIPT_DESERET"/>
-      <member name="t_devanagari"
+      <member name="tdevanagari"
               value="10"
               c:identifier="G_UNICODE_SCRIPT_DEVANAGARI"/>
-      <member name="t_ethiopic"
+      <member name="tethiopic"
               value="11"
               c:identifier="G_UNICODE_SCRIPT_ETHIOPIC"/>
-      <member name="t_georgian"
+      <member name="tgeorgian"
               value="12"
               c:identifier="G_UNICODE_SCRIPT_GEORGIAN"/>
-      <member name="t_gothic"
+      <member name="tgothic"
               value="13"
               c:identifier="G_UNICODE_SCRIPT_GOTHIC"/>
-      <member name="t_greek" value="14" c:identifier="G_UNICODE_SCRIPT_GREEK"/>
-      <member name="t_gujarati"
+      <member name="tgreek" value="14" c:identifier="G_UNICODE_SCRIPT_GREEK"/>
+      <member name="tgujarati"
               value="15"
               c:identifier="G_UNICODE_SCRIPT_GUJARATI"/>
-      <member name="t_gurmukhi"
+      <member name="tgurmukhi"
               value="16"
               c:identifier="G_UNICODE_SCRIPT_GURMUKHI"/>
-      <member name="t_han" value="17" c:identifier="G_UNICODE_SCRIPT_HAN"/>
-      <member name="t_hangul"
+      <member name="than" value="17" c:identifier="G_UNICODE_SCRIPT_HAN"/>
+      <member name="thangul"
               value="18"
               c:identifier="G_UNICODE_SCRIPT_HANGUL"/>
-      <member name="t_hebrew"
+      <member name="thebrew"
               value="19"
               c:identifier="G_UNICODE_SCRIPT_HEBREW"/>
-      <member name="t_hiragana"
+      <member name="thiragana"
               value="20"
               c:identifier="G_UNICODE_SCRIPT_HIRAGANA"/>
-      <member name="t_kannada"
+      <member name="tkannada"
               value="21"
               c:identifier="G_UNICODE_SCRIPT_KANNADA"/>
-      <member name="t_katakana"
+      <member name="tkatakana"
               value="22"
               c:identifier="G_UNICODE_SCRIPT_KATAKANA"/>
-      <member name="t_khmer" value="23" c:identifier="G_UNICODE_SCRIPT_KHMER"/>
-      <member name="t_lao" value="24" c:identifier="G_UNICODE_SCRIPT_LAO"/>
-      <member name="t_latin" value="25" c:identifier="G_UNICODE_SCRIPT_LATIN"/>
-      <member name="t_malayalam"
+      <member name="tkhmer" value="23" c:identifier="G_UNICODE_SCRIPT_KHMER"/>
+      <member name="tlao" value="24" c:identifier="G_UNICODE_SCRIPT_LAO"/>
+      <member name="tlatin" value="25" c:identifier="G_UNICODE_SCRIPT_LATIN"/>
+      <member name="tmalayalam"
               value="26"
               c:identifier="G_UNICODE_SCRIPT_MALAYALAM"/>
-      <member name="t_mongolian"
+      <member name="tmongolian"
               value="27"
               c:identifier="G_UNICODE_SCRIPT_MONGOLIAN"/>
-      <member name="t_myanmar"
+      <member name="tmyanmar"
               value="28"
               c:identifier="G_UNICODE_SCRIPT_MYANMAR"/>
-      <member name="t_ogham" value="29" c:identifier="G_UNICODE_SCRIPT_OGHAM"/>
-      <member name="t_old_italic"
+      <member name="togham" value="29" c:identifier="G_UNICODE_SCRIPT_OGHAM"/>
+      <member name="tolditalic"
               value="30"
               c:identifier="G_UNICODE_SCRIPT_OLD_ITALIC"/>
-      <member name="t_oriya" value="31" c:identifier="G_UNICODE_SCRIPT_ORIYA"/>
-      <member name="t_runic" value="32" c:identifier="G_UNICODE_SCRIPT_RUNIC"/>
-      <member name="t_sinhala"
+      <member name="toriya" value="31" c:identifier="G_UNICODE_SCRIPT_ORIYA"/>
+      <member name="trunic" value="32" c:identifier="G_UNICODE_SCRIPT_RUNIC"/>
+      <member name="tsinhala"
               value="33"
               c:identifier="G_UNICODE_SCRIPT_SINHALA"/>
-      <member name="t_syriac"
+      <member name="tsyriac"
               value="34"
               c:identifier="G_UNICODE_SCRIPT_SYRIAC"/>
-      <member name="t_tamil" value="35" c:identifier="G_UNICODE_SCRIPT_TAMIL"/>
-      <member name="t_telugu"
+      <member name="ttamil" value="35" c:identifier="G_UNICODE_SCRIPT_TAMIL"/>
+      <member name="ttelugu"
               value="36"
               c:identifier="G_UNICODE_SCRIPT_TELUGU"/>
-      <member name="t_thaana"
+      <member name="tthaana"
               value="37"
               c:identifier="G_UNICODE_SCRIPT_THAANA"/>
-      <member name="t_thai" value="38" c:identifier="G_UNICODE_SCRIPT_THAI"/>
-      <member name="t_tibetan"
+      <member name="tthai" value="38" c:identifier="G_UNICODE_SCRIPT_THAI"/>
+      <member name="ttibetan"
               value="39"
               c:identifier="G_UNICODE_SCRIPT_TIBETAN"/>
-      <member name="t_canadian_aboriginal"
+      <member name="tcanadianaboriginal"
               value="40"
               c:identifier="G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL"/>
-      <member name="t_yi" value="41" c:identifier="G_UNICODE_SCRIPT_YI"/>
-      <member name="t_tagalog"
+      <member name="tyi" value="41" c:identifier="G_UNICODE_SCRIPT_YI"/>
+      <member name="ttagalog"
               value="42"
               c:identifier="G_UNICODE_SCRIPT_TAGALOG"/>
-      <member name="t_hanunoo"
+      <member name="thanunoo"
               value="43"
               c:identifier="G_UNICODE_SCRIPT_HANUNOO"/>
-      <member name="t_buhid" value="44" c:identifier="G_UNICODE_SCRIPT_BUHID"/>
-      <member name="t_tagbanwa"
+      <member name="tbuhid" value="44" c:identifier="G_UNICODE_SCRIPT_BUHID"/>
+      <member name="ttagbanwa"
               value="45"
               c:identifier="G_UNICODE_SCRIPT_TAGBANWA"/>
-      <member name="t_braille"
+      <member name="tbraille"
               value="46"
               c:identifier="G_UNICODE_SCRIPT_BRAILLE"/>
-      <member name="t_cypriot"
+      <member name="tcypriot"
               value="47"
               c:identifier="G_UNICODE_SCRIPT_CYPRIOT"/>
-      <member name="t_limbu" value="48" c:identifier="G_UNICODE_SCRIPT_LIMBU"/>
-      <member name="t_osmanya"
+      <member name="tlimbu" value="48" c:identifier="G_UNICODE_SCRIPT_LIMBU"/>
+      <member name="tosmanya"
               value="49"
               c:identifier="G_UNICODE_SCRIPT_OSMANYA"/>
-      <member name="t_shavian"
+      <member name="tshavian"
               value="50"
               c:identifier="G_UNICODE_SCRIPT_SHAVIAN"/>
-      <member name="t_linear_b"
+      <member name="tlinearb"
               value="51"
               c:identifier="G_UNICODE_SCRIPT_LINEAR_B"/>
-      <member name="t_tai_le"
-              value="52"
-              c:identifier="G_UNICODE_SCRIPT_TAI_LE"/>
-      <member name="t_ugaritic"
+      <member name="ttaile" value="52" c:identifier="G_UNICODE_SCRIPT_TAI_LE"/>
+      <member name="tugaritic"
               value="53"
               c:identifier="G_UNICODE_SCRIPT_UGARITIC"/>
-      <member name="t_new_tai_lue"
+      <member name="tnewtailue"
               value="54"
               c:identifier="G_UNICODE_SCRIPT_NEW_TAI_LUE"/>
-      <member name="t_buginese"
+      <member name="tbuginese"
               value="55"
               c:identifier="G_UNICODE_SCRIPT_BUGINESE"/>
-      <member name="t_glagolitic"
+      <member name="tglagolitic"
               value="56"
               c:identifier="G_UNICODE_SCRIPT_GLAGOLITIC"/>
-      <member name="t_tifinagh"
+      <member name="ttifinagh"
               value="57"
               c:identifier="G_UNICODE_SCRIPT_TIFINAGH"/>
-      <member name="t_syloti_nagri"
+      <member name="tsylotinagri"
               value="58"
               c:identifier="G_UNICODE_SCRIPT_SYLOTI_NAGRI"/>
-      <member name="t_old_persian"
+      <member name="toldpersian"
               value="59"
               c:identifier="G_UNICODE_SCRIPT_OLD_PERSIAN"/>
-      <member name="t_kharoshthi"
+      <member name="tkharoshthi"
               value="60"
               c:identifier="G_UNICODE_SCRIPT_KHAROSHTHI"/>
-      <member name="t_unknown"
+      <member name="tunknown"
               value="61"
               c:identifier="G_UNICODE_SCRIPT_UNKNOWN"/>
-      <member name="t_balinese"
+      <member name="tbalinese"
               value="62"
               c:identifier="G_UNICODE_SCRIPT_BALINESE"/>
-      <member name="t_cuneiform"
+      <member name="tcuneiform"
               value="63"
               c:identifier="G_UNICODE_SCRIPT_CUNEIFORM"/>
-      <member name="t_phoenician"
+      <member name="tphoenician"
               value="64"
               c:identifier="G_UNICODE_SCRIPT_PHOENICIAN"/>
-      <member name="t_phags_pa"
+      <member name="tphagspa"
               value="65"
               c:identifier="G_UNICODE_SCRIPT_PHAGS_PA"/>
-      <member name="t_nko" value="66" c:identifier="G_UNICODE_SCRIPT_NKO"/>
-      <member name="t_kayah_li"
+      <member name="tnko" value="66" c:identifier="G_UNICODE_SCRIPT_NKO"/>
+      <member name="tkayahli"
               value="67"
               c:identifier="G_UNICODE_SCRIPT_KAYAH_LI"/>
-      <member name="t_lepcha"
+      <member name="tlepcha"
               value="68"
               c:identifier="G_UNICODE_SCRIPT_LEPCHA"/>
-      <member name="t_rejang"
+      <member name="trejang"
               value="69"
               c:identifier="G_UNICODE_SCRIPT_REJANG"/>
-      <member name="t_sundanese"
+      <member name="tsundanese"
               value="70"
               c:identifier="G_UNICODE_SCRIPT_SUNDANESE"/>
-      <member name="t_saurashtra"
+      <member name="tsaurashtra"
               value="71"
               c:identifier="G_UNICODE_SCRIPT_SAURASHTRA"/>
-      <member name="t_cham" value="72" c:identifier="G_UNICODE_SCRIPT_CHAM"/>
-      <member name="t_ol_chiki"
+      <member name="tcham" value="72" c:identifier="G_UNICODE_SCRIPT_CHAM"/>
+      <member name="tolchiki"
               value="73"
               c:identifier="G_UNICODE_SCRIPT_OL_CHIKI"/>
-      <member name="t_vai" value="74" c:identifier="G_UNICODE_SCRIPT_VAI"/>
-      <member name="t_carian"
+      <member name="tvai" value="74" c:identifier="G_UNICODE_SCRIPT_VAI"/>
+      <member name="tcarian"
               value="75"
               c:identifier="G_UNICODE_SCRIPT_CARIAN"/>
-      <member name="t_lycian"
+      <member name="tlycian"
               value="76"
               c:identifier="G_UNICODE_SCRIPT_LYCIAN"/>
-      <member name="t_lydian"
+      <member name="tlydian"
               value="77"
               c:identifier="G_UNICODE_SCRIPT_LYDIAN"/>
     </enumeration>
-    <function name="get_charset" c:identifier="g_get_charset">
+    <function name="et_charset" c:identifier="g_get_charset">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -9305,7 +9267,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9315,7 +9277,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9325,7 +9287,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9335,7 +9297,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9345,7 +9307,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9355,7 +9317,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9365,7 +9327,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9375,7 +9337,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9385,7 +9347,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9395,7 +9357,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9405,7 +9367,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9415,7 +9377,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9425,7 +9387,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9435,7 +9397,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9445,7 +9407,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9455,7 +9417,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9465,89 +9427,89 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_toupper" c:identifier="g_unichar_toupper">
       <return-value>
-        <type name="gunichar" c:type="gunichar"/>
+        <type name="unichar" c:type="gunichar"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_tolower" c:identifier="g_unichar_tolower">
       <return-value>
-        <type name="gunichar" c:type="gunichar"/>
+        <type name="unichar" c:type="gunichar"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_totitle" c:identifier="g_unichar_totitle">
       <return-value>
-        <type name="gunichar" c:type="gunichar"/>
+        <type name="unichar" c:type="gunichar"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_digit_value" c:identifier="g_unichar_digit_value">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_xdigit_value"
               c:identifier="g_unichar_xdigit_value">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_type" c:identifier="g_unichar_type">
       <return-value>
-        <type name="GUnicodeType" c:type="GUnicodeType"/>
+        <type name="UnicodeType" c:type="GUnicodeType"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_break_type" c:identifier="g_unichar_break_type">
       <return-value>
-        <type name="GUnicodeBreakType" c:type="GUnicodeBreakType"/>
+        <type name="UnicodeBreakType" c:type="GUnicodeBreakType"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_combining_class"
               c:identifier="g_unichar_combining_class">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="uc">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9558,7 +9520,7 @@
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="gunichar" c:type="gunichar*"/>
+          <type name="unichar" c:type="gunichar*"/>
         </parameter>
         <parameter name="len">
           <type name="size" c:type="gsize"/>
@@ -9568,20 +9530,20 @@
     <function name="unicode_canonical_decomposition"
               c:identifier="g_unicode_canonical_decomposition">
       <return-value>
-        <type name="gunichar" c:type="gunichar*"/>
+        <type name="unichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="ch">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
         <parameter name="result_len">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
     <function name="utf8_get_char" c:identifier="g_utf8_get_char">
       <return-value>
-        <type name="gunichar" c:type="gunichar"/>
+        <type name="unichar" c:type="gunichar"/>
       </return-value>
       <parameters>
         <parameter name="p">
@@ -9592,7 +9554,7 @@
     <function name="utf8_get_char_validated"
               c:identifier="g_utf8_get_char_validated">
       <return-value>
-        <type name="gunichar" c:type="gunichar"/>
+        <type name="unichar" c:type="gunichar"/>
       </return-value>
       <parameters>
         <parameter name="p">
@@ -9708,7 +9670,7 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9724,7 +9686,7 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9743,7 +9705,7 @@
     </function>
     <function name="utf8_to_utf16" c:identifier="g_utf8_to_utf16">
       <return-value>
-        <type name="gunichar2" c:type="gunichar2*"/>
+        <type name="unichar2" c:type="gunichar2*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9753,19 +9715,19 @@
           <type name="long" c:type="glong"/>
         </parameter>
         <parameter name="items_read">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="items_written">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="utf8_to_ucs4" c:identifier="g_utf8_to_ucs4">
       <return-value>
-        <type name="gunichar" c:type="gunichar*"/>
+        <type name="unichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9775,19 +9737,19 @@
           <type name="long" c:type="glong"/>
         </parameter>
         <parameter name="items_read">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="items_written">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="utf8_to_ucs4_fast" c:identifier="g_utf8_to_ucs4_fast">
       <return-value>
-        <type name="gunichar" c:type="gunichar*"/>
+        <type name="unichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9797,29 +9759,29 @@
           <type name="long" c:type="glong"/>
         </parameter>
         <parameter name="items_written">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
       </parameters>
     </function>
     <function name="utf16_to_ucs4" c:identifier="g_utf16_to_ucs4">
       <return-value>
-        <type name="gunichar" c:type="gunichar*"/>
+        <type name="unichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gunichar2" c:type="gunichar2*"/>
+          <type name="unichar2" c:type="gunichar2*"/>
         </parameter>
         <parameter name="len">
           <type name="long" c:type="glong"/>
         </parameter>
         <parameter name="items_read">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="items_written">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -9829,41 +9791,41 @@
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gunichar2" c:type="gunichar2*"/>
+          <type name="unichar2" c:type="gunichar2*"/>
         </parameter>
         <parameter name="len">
           <type name="long" c:type="glong"/>
         </parameter>
         <parameter name="items_read">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="items_written">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="ucs4_to_utf16" c:identifier="g_ucs4_to_utf16">
       <return-value>
-        <type name="gunichar2" c:type="gunichar2*"/>
+        <type name="unichar2" c:type="gunichar2*"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gunichar" c:type="gunichar*"/>
+          <type name="unichar" c:type="gunichar*"/>
         </parameter>
         <parameter name="len">
           <type name="long" c:type="glong"/>
         </parameter>
         <parameter name="items_read">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="items_written">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -9873,29 +9835,29 @@
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gunichar" c:type="gunichar*"/>
+          <type name="unichar" c:type="gunichar*"/>
         </parameter>
         <parameter name="len">
           <type name="long" c:type="glong"/>
         </parameter>
         <parameter name="items_read">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="items_written">
-          <type name="glong" c:type="glong*"/>
+          <type name="long" c:type="glong*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_to_utf8" c:identifier="g_unichar_to_utf8">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
         <parameter name="outbuf">
           <type name="string" c:type="gchar*"/>
@@ -9914,7 +9876,7 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="end">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -9924,7 +9886,7 @@
       </return-value>
       <parameters>
         <parameter name="ch">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
@@ -9967,16 +9929,16 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GNormalizeMode" c:type="GNormalizeMode">
+    <enumeration name="NormalizeMode" c:type="GNormalizeMode">
       <member name="default" value="0" c:identifier="G_NORMALIZE_DEFAULT"/>
       <member name="nfd" value="0" c:identifier="G_NORMALIZE_NFD"/>
-      <member name="default_compose"
+      <member name="defaultcompose"
               value="1"
               c:identifier="G_NORMALIZE_DEFAULT_COMPOSE"/>
       <member name="nfc" value="1" c:identifier="G_NORMALIZE_NFC"/>
       <member name="all" value="2" c:identifier="G_NORMALIZE_ALL"/>
       <member name="nfkd" value="2" c:identifier="G_NORMALIZE_NFKD"/>
-      <member name="all_compose"
+      <member name="allcompose"
               value="3"
               c:identifier="G_NORMALIZE_ALL_COMPOSE"/>
       <member name="nfkc" value="3" c:identifier="G_NORMALIZE_NFKC"/>
@@ -9993,13 +9955,13 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="mode">
-          <type name="GNormalizeMode" c:type="GNormalizeMode"/>
+          <type name="NormalizeMode" c:type="GNormalizeMode"/>
         </parameter>
       </parameters>
     </function>
     <function name="utf8_collate" c:identifier="g_utf8_collate">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="str1">
@@ -10044,24 +10006,24 @@
       </return-value>
       <parameters>
         <parameter name="ch">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
         <parameter name="mirrored_ch">
-          <type name="gunichar" c:type="gunichar*"/>
+          <type name="unichar" c:type="gunichar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="unichar_get_script" c:identifier="g_unichar_get_script">
       <return-value>
-        <type name="GUnicodeScript" c:type="GUnicodeScript"/>
+        <type name="UnicodeScript" c:type="GUnicodeScript"/>
       </return-value>
       <parameters>
         <parameter name="ch">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
-    <function name="g_utf8_make_valid" c:identifier="_g_utf8_make_valid">
+    <function name="utf8_make_valid" c:identifier="_g_utf8_make_valid">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
@@ -10071,9 +10033,7 @@
         </parameter>
       </parameters>
     </function>
-    <record name="String" c:type="GString"/>
-    <record name="StringChunk" c:type="GStringChunk"/>
-    <record name="GString" c:type="_GString">
+    <record name="String" c:type="GString">
       <field name="str">
         <type name="string" c:type="gchar*"/>
       </field>
@@ -10084,9 +10044,10 @@
         <type name="size" c:type="gsize"/>
       </field>
     </record>
+    <record name="StringChunk" c:type="GStringChunk"/>
     <function name="string_chunk_new" c:identifier="g_string_chunk_new">
       <return-value>
-        <type name="GStringChunk" c:type="GStringChunk*"/>
+        <type name="StringChunk" c:type="GStringChunk*"/>
       </return-value>
       <parameters>
         <parameter name="size">
@@ -10100,7 +10061,7 @@
       </return-value>
       <parameters>
         <parameter name="chunk">
-          <type name="GStringChunk" c:type="GStringChunk*"/>
+          <type name="StringChunk" c:type="GStringChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -10110,7 +10071,7 @@
       </return-value>
       <parameters>
         <parameter name="chunk">
-          <type name="GStringChunk" c:type="GStringChunk*"/>
+          <type name="StringChunk" c:type="GStringChunk*"/>
         </parameter>
       </parameters>
     </function>
@@ -10120,7 +10081,7 @@
       </return-value>
       <parameters>
         <parameter name="chunk">
-          <type name="GStringChunk" c:type="GStringChunk*"/>
+          <type name="StringChunk" c:type="GStringChunk*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -10134,7 +10095,7 @@
       </return-value>
       <parameters>
         <parameter name="chunk">
-          <type name="GStringChunk" c:type="GStringChunk*"/>
+          <type name="StringChunk" c:type="GStringChunk*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -10151,7 +10112,7 @@
       </return-value>
       <parameters>
         <parameter name="chunk">
-          <type name="GStringChunk" c:type="GStringChunk*"/>
+          <type name="StringChunk" c:type="GStringChunk*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -10160,7 +10121,7 @@
     </function>
     <function name="string_new" c:identifier="g_string_new">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="init">
@@ -10170,7 +10131,7 @@
     </function>
     <function name="string_new_len" c:identifier="g_string_new_len">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="init">
@@ -10183,7 +10144,7 @@
     </function>
     <function name="string_sized_new" c:identifier="g_string_sized_new">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="dfl_size">
@@ -10197,7 +10158,7 @@
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="free_segment">
           <type name="boolean" c:type="gboolean"/>
@@ -10210,30 +10171,30 @@
       </return-value>
       <parameters>
         <parameter name="v">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="v2">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_hash" c:identifier="g_string_hash">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_assign" c:identifier="g_string_assign">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="rval">
           <type name="string" c:type="gchar*"/>
@@ -10242,11 +10203,11 @@
     </function>
     <function name="string_truncate" c:identifier="g_string_truncate">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="len">
           <type name="size" c:type="gsize"/>
@@ -10255,11 +10216,11 @@
     </function>
     <function name="string_set_size" c:identifier="g_string_set_size">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="len">
           <type name="size" c:type="gsize"/>
@@ -10268,11 +10229,11 @@
     </function>
     <function name="string_insert_len" c:identifier="g_string_insert_len">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
           <type name="ssize" c:type="gssize"/>
@@ -10287,11 +10248,11 @@
     </function>
     <function name="string_append" c:identifier="g_string_append">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
@@ -10300,11 +10261,11 @@
     </function>
     <function name="string_append_len" c:identifier="g_string_append_len">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
@@ -10316,38 +10277,38 @@
     </function>
     <function name="string_append_c" c:identifier="g_string_append_c">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="c">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_append_unichar"
               c:identifier="g_string_append_unichar">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="wc">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_prepend" c:identifier="g_string_prepend">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
@@ -10356,38 +10317,38 @@
     </function>
     <function name="string_prepend_c" c:identifier="g_string_prepend_c">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="c">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_prepend_unichar"
               c:identifier="g_string_prepend_unichar">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="wc">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_prepend_len" c:identifier="g_string_prepend_len">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
@@ -10399,11 +10360,11 @@
     </function>
     <function name="string_insert" c:identifier="g_string_insert">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
           <type name="ssize" c:type="gssize"/>
@@ -10415,44 +10376,44 @@
     </function>
     <function name="string_insert_c" c:identifier="g_string_insert_c">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="c">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_insert_unichar"
               c:identifier="g_string_insert_unichar">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="wc">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_overwrite" c:identifier="g_string_overwrite">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
           <type name="size" c:type="gsize"/>
@@ -10465,11 +10426,11 @@
     <function name="string_overwrite_len"
               c:identifier="g_string_overwrite_len">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
           <type name="size" c:type="gsize"/>
@@ -10484,11 +10445,11 @@
     </function>
     <function name="string_erase" c:identifier="g_string_erase">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
           <type name="ssize" c:type="gssize"/>
@@ -10500,21 +10461,21 @@
     </function>
     <function name="string_ascii_down" c:identifier="g_string_ascii_down">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_ascii_up" c:identifier="g_string_ascii_up">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
@@ -10524,7 +10485,7 @@
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -10538,7 +10499,7 @@
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -10548,11 +10509,11 @@
     <function name="string_append_uri_escaped"
               c:identifier="g_string_append_uri_escaped">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="unescaped">
           <type name="string" c:type="char*"/>
@@ -10567,142 +10528,78 @@
     </function>
     <function name="string_down" c:identifier="g_string_down">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_up" c:identifier="g_string_up">
       <return-value>
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="IOChannel" c:type="GIOChannel"/>
-    <record name="IOFuncs" c:type="GIOFuncs"/>
-    <enumeration name="GIOError" c:type="GIOError">
-      <member name="r_none" value="0" c:identifier="G_IO_ERROR_NONE"/>
-      <member name="r_again" value="1" c:identifier="G_IO_ERROR_AGAIN"/>
-      <member name="r_inval" value="2" c:identifier="G_IO_ERROR_INVAL"/>
-      <member name="r_unknown" value="3" c:identifier="G_IO_ERROR_UNKNOWN"/>
-    </enumeration>
-    <enumeration name="GIOChannelError" c:type="GIOChannelError">
-      <member name="r_fbig" value="0" c:identifier="G_IO_CHANNEL_ERROR_FBIG"/>
-      <member name="r_inval"
-              value="1"
-              c:identifier="G_IO_CHANNEL_ERROR_INVAL"/>
-      <member name="r_io" value="2" c:identifier="G_IO_CHANNEL_ERROR_IO"/>
-      <member name="r_isdir"
-              value="3"
-              c:identifier="G_IO_CHANNEL_ERROR_ISDIR"/>
-      <member name="r_nospc"
-              value="4"
-              c:identifier="G_IO_CHANNEL_ERROR_NOSPC"/>
-      <member name="r_nxio" value="5" c:identifier="G_IO_CHANNEL_ERROR_NXIO"/>
-      <member name="r_overflow"
-              value="6"
-              c:identifier="G_IO_CHANNEL_ERROR_OVERFLOW"/>
-      <member name="r_pipe" value="7" c:identifier="G_IO_CHANNEL_ERROR_PIPE"/>
-      <member name="r_failed"
-              value="8"
-              c:identifier="G_IO_CHANNEL_ERROR_FAILED"/>
-    </enumeration>
-    <enumeration name="GIOStatus" c:type="GIOStatus">
-      <member name="s_error" value="0" c:identifier="G_IO_STATUS_ERROR"/>
-      <member name="s_normal" value="1" c:identifier="G_IO_STATUS_NORMAL"/>
-      <member name="s_eof" value="2" c:identifier="G_IO_STATUS_EOF"/>
-      <member name="s_again" value="3" c:identifier="G_IO_STATUS_AGAIN"/>
-    </enumeration>
-    <enumeration name="GSeekType" c:type="GSeekType">
-      <member name="cur" value="0" c:identifier="G_SEEK_CUR"/>
-      <member name="set" value="1" c:identifier="G_SEEK_SET"/>
-      <member name="end" value="2" c:identifier="G_SEEK_END"/>
-    </enumeration>
-    <enumeration name="GIOCondition" c:type="GIOCondition">
-      <member name="in" value="1" c:identifier="G_IO_IN"/>
-      <member name="out" value="4" c:identifier="G_IO_OUT"/>
-      <member name="pri" value="2" c:identifier="G_IO_PRI"/>
-      <member name="err" value="8" c:identifier="G_IO_ERR"/>
-      <member name="hup" value="16" c:identifier="G_IO_HUP"/>
-      <member name="nval" value="32" c:identifier="G_IO_NVAL"/>
-    </enumeration>
-    <enumeration name="GIOFlags" c:type="GIOFlags">
-      <member name="_append" value="1" c:identifier="G_IO_FLAG_APPEND"/>
-      <member name="_nonblock" value="2" c:identifier="G_IO_FLAG_NONBLOCK"/>
-      <member name="_is_readable"
-              value="4"
-              c:identifier="G_IO_FLAG_IS_READABLE"/>
-      <member name="_is_writeable"
-              value="8"
-              c:identifier="G_IO_FLAG_IS_WRITEABLE"/>
-      <member name="_is_seekable"
-              value="16"
-              c:identifier="G_IO_FLAG_IS_SEEKABLE"/>
-      <member name="_mask" value="31" c:identifier="G_IO_FLAG_MASK"/>
-      <member name="_get_mask" value="31" c:identifier="G_IO_FLAG_GET_MASK"/>
-      <member name="_set_mask" value="3" c:identifier="G_IO_FLAG_SET_MASK"/>
-    </enumeration>
-    <record name="GIOChannel" c:type="_GIOChannel">
+    <record name="IOChannel" c:type="GIOChannel">
       <field name="ref_count">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </field>
       <field name="funcs">
-        <type name="GIOFuncs" c:type="GIOFuncs*"/>
+        <type name="IOFuncs" c:type="GIOFuncs*"/>
       </field>
       <field name="encoding">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="read_cd">
-        <type name="GIConv" c:type="GIConv"/>
+        <type name="IConv" c:type="GIConv"/>
       </field>
       <field name="write_cd">
-        <type name="GIConv" c:type="GIConv"/>
+        <type name="IConv" c:type="GIConv"/>
       </field>
       <field name="line_term">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="line_term_len">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="buf_size">
         <type name="size" c:type="gsize"/>
       </field>
       <field name="read_buf">
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </field>
       <field name="encoded_read_buf">
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </field>
       <field name="write_buf">
-        <type name="GString" c:type="GString*"/>
+        <type name="String" c:type="GString*"/>
       </field>
       <field name="partial_write_buf">
-        <type name="gchar" c:type="gchar"/>
+        <type name="char" c:type="gchar"/>
       </field>
       <field name="use_buffer">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="do_encode">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="close_on_unref">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="is_readable">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="is_writeable">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="is_seekable">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="reserved1">
         <type name="any" c:type="gpointer"/>
@@ -10711,30 +10608,14 @@
         <type name="any" c:type="gpointer"/>
       </field>
     </record>
-    <callback name="GIOFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="source">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
-        </parameter>
-        <parameter name="condition">
-          <type name="GIOCondition" c:type="GIOCondition"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GIOFuncs" c:type="_GIOFuncs">
-      <callback name="io_read">
+    <record name="IOFuncs" c:type="GIOFuncs">
+      <callback name="io_read" c:type="io_read">
         <return-value>
-          <type name="GIOStatus" c:type="GIOStatus"/>
+          <type name="IOStatus" c:type="GIOStatus"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="buf">
             <type name="string" c:type="gchar*"/>
@@ -10743,20 +10624,20 @@
             <type name="size" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_read">
-            <type name="gsize" c:type="gsize*"/>
+            <type name="size" c:type="gsize*"/>
           </parameter>
           <parameter name="err">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="io_write">
+      <callback name="io_write" c:type="io_write">
         <return-value>
-          <type name="GIOStatus" c:type="GIOStatus"/>
+          <type name="IOStatus" c:type="GIOStatus"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="buf">
             <type name="string" c:type="gchar*"/>
@@ -10765,112 +10646,184 @@
             <type name="size" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_written">
-            <type name="gsize" c:type="gsize*"/>
+            <type name="size" c:type="gsize*"/>
           </parameter>
           <parameter name="err">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="io_seek">
+      <callback name="io_seek" c:type="io_seek">
         <return-value>
-          <type name="GIOStatus" c:type="GIOStatus"/>
+          <type name="IOStatus" c:type="GIOStatus"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="offset">
-            <type name="gint64" c:type="gint64"/>
+            <type name="int64" c:type="gint64"/>
           </parameter>
           <parameter name="type">
-            <type name="GSeekType" c:type="GSeekType"/>
+            <type name="SeekType" c:type="GSeekType"/>
           </parameter>
           <parameter name="err">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="io_close">
+      <callback name="io_close" c:type="io_close">
         <return-value>
-          <type name="GIOStatus" c:type="GIOStatus"/>
+          <type name="IOStatus" c:type="GIOStatus"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="err">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="io_create_watch">
+      <callback name="io_create_watch" c:type="io_create_watch">
         <return-value>
-          <type name="GSource" c:type="GSource*"/>
+          <type name="Source" c:type="GSource*"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="condition">
-            <type name="GIOCondition" c:type="GIOCondition"/>
+            <type name="IOCondition" c:type="GIOCondition"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="io_free">
+      <callback name="io_free" c:type="io_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="io_set_flags">
+      <callback name="io_set_flags" c:type="io_set_flags">
         <return-value>
-          <type name="GIOStatus" c:type="GIOStatus"/>
+          <type name="IOStatus" c:type="GIOStatus"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GIOFlags" c:type="GIOFlags"/>
+            <type name="IOFlags" c:type="GIOFlags"/>
           </parameter>
           <parameter name="err">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="io_get_flags">
+      <callback name="io_get_flags" c:type="io_get_flags">
         <return-value>
-          <type name="GIOFlags" c:type="GIOFlags"/>
+          <type name="IOFlags" c:type="GIOFlags"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel" c:type="GIOChannel*"/>
+            <type name="IOChannel" c:type="GIOChannel*"/>
           </parameter>
         </parameters>
       </callback>
     </record>
+    <enumeration name="IOError" c:type="GIOError">
+      <member name="rnone" value="0" c:identifier="G_IO_ERROR_NONE"/>
+      <member name="ragain" value="1" c:identifier="G_IO_ERROR_AGAIN"/>
+      <member name="rinval" value="2" c:identifier="G_IO_ERROR_INVAL"/>
+      <member name="runknown" value="3" c:identifier="G_IO_ERROR_UNKNOWN"/>
+    </enumeration>
+    <enumeration name="IOChannelError" c:type="GIOChannelError">
+      <member name="rfbig" value="0" c:identifier="G_IO_CHANNEL_ERROR_FBIG"/>
+      <member name="rinval" value="1" c:identifier="G_IO_CHANNEL_ERROR_INVAL"/>
+      <member name="rio" value="2" c:identifier="G_IO_CHANNEL_ERROR_IO"/>
+      <member name="risdir" value="3" c:identifier="G_IO_CHANNEL_ERROR_ISDIR"/>
+      <member name="rnospc" value="4" c:identifier="G_IO_CHANNEL_ERROR_NOSPC"/>
+      <member name="rnxio" value="5" c:identifier="G_IO_CHANNEL_ERROR_NXIO"/>
+      <member name="roverflow"
+              value="6"
+              c:identifier="G_IO_CHANNEL_ERROR_OVERFLOW"/>
+      <member name="rpipe" value="7" c:identifier="G_IO_CHANNEL_ERROR_PIPE"/>
+      <member name="rfailed"
+              value="8"
+              c:identifier="G_IO_CHANNEL_ERROR_FAILED"/>
+    </enumeration>
+    <enumeration name="IOStatus" c:type="GIOStatus">
+      <member name="serror" value="0" c:identifier="G_IO_STATUS_ERROR"/>
+      <member name="snormal" value="1" c:identifier="G_IO_STATUS_NORMAL"/>
+      <member name="seof" value="2" c:identifier="G_IO_STATUS_EOF"/>
+      <member name="sagain" value="3" c:identifier="G_IO_STATUS_AGAIN"/>
+    </enumeration>
+    <enumeration name="SeekType" c:type="GSeekType">
+      <member name="cur" value="0" c:identifier="G_SEEK_CUR"/>
+      <member name="set" value="1" c:identifier="G_SEEK_SET"/>
+      <member name="end" value="2" c:identifier="G_SEEK_END"/>
+    </enumeration>
+    <enumeration name="IOCondition" c:type="GIOCondition">
+      <member name="in" value="1" c:identifier="G_IO_IN"/>
+      <member name="out" value="4" c:identifier="G_IO_OUT"/>
+      <member name="pri" value="2" c:identifier="G_IO_PRI"/>
+      <member name="err" value="8" c:identifier="G_IO_ERR"/>
+      <member name="hup" value="16" c:identifier="G_IO_HUP"/>
+      <member name="nval" value="32" c:identifier="G_IO_NVAL"/>
+    </enumeration>
+    <enumeration name="IOFlags" c:type="GIOFlags">
+      <member name="append" value="1" c:identifier="G_IO_FLAG_APPEND"/>
+      <member name="nonblock" value="2" c:identifier="G_IO_FLAG_NONBLOCK"/>
+      <member name="isreadable"
+              value="4"
+              c:identifier="G_IO_FLAG_IS_READABLE"/>
+      <member name="iswriteable"
+              value="8"
+              c:identifier="G_IO_FLAG_IS_WRITEABLE"/>
+      <member name="isseekable"
+              value="16"
+              c:identifier="G_IO_FLAG_IS_SEEKABLE"/>
+      <member name="mask" value="31" c:identifier="G_IO_FLAG_MASK"/>
+      <member name="getmask" value="31" c:identifier="G_IO_FLAG_GET_MASK"/>
+      <member name="setmask" value="3" c:identifier="G_IO_FLAG_SET_MASK"/>
+    </enumeration>
+    <callback name="IOFunc" c:type="GIOFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="source">
+          <type name="IOChannel" c:type="GIOChannel*"/>
+        </parameter>
+        <parameter name="condition">
+          <type name="IOCondition" c:type="GIOCondition"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
     <function name="io_channel_init" c:identifier="g_io_channel_init">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_ref" c:identifier="g_io_channel_ref">
       <return-value>
-        <type name="GIOChannel" c:type="GIOChannel*"/>
+        <type name="IOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
@@ -10880,17 +10833,17 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_read" c:identifier="g_io_channel_read">
       <return-value>
-        <type name="GIOError" c:type="GIOError"/>
+        <type name="IOError" c:type="GIOError"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="buf">
           <type name="string" c:type="gchar*"/>
@@ -10899,17 +10852,17 @@
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_write" c:identifier="g_io_channel_write">
       <return-value>
-        <type name="GIOError" c:type="GIOError"/>
+        <type name="IOError" c:type="GIOError"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="buf">
           <type name="string" c:type="gchar*"/>
@@ -10918,23 +10871,23 @@
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_seek" c:identifier="g_io_channel_seek">
       <return-value>
-        <type name="GIOError" c:type="GIOError"/>
+        <type name="IOError" c:type="GIOError"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="offset">
-          <type name="gint64" c:type="gint64"/>
+          <type name="int64" c:type="gint64"/>
         </parameter>
         <parameter name="type">
-          <type name="GSeekType" c:type="GSeekType"/>
+          <type name="SeekType" c:type="GSeekType"/>
         </parameter>
       </parameters>
     </function>
@@ -10944,77 +10897,77 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_shutdown" c:identifier="g_io_channel_shutdown">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="flush">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="err">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_add_watch_full" c:identifier="g_io_add_watch_full">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="priority">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="condition">
-          <type name="GIOCondition" c:type="GIOCondition"/>
+          <type name="IOCondition" c:type="GIOCondition"/>
         </parameter>
         <parameter name="func">
-          <type name="GIOFunc" c:type="GIOFunc"/>
+          <type name="IOFunc" c:type="GIOFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_create_watch" c:identifier="g_io_create_watch">
       <return-value>
-        <type name="GSource" c:type="GSource*"/>
+        <type name="Source" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="condition">
-          <type name="GIOCondition" c:type="GIOCondition"/>
+          <type name="IOCondition" c:type="GIOCondition"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_add_watch" c:identifier="g_io_add_watch">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="condition">
-          <type name="GIOCondition" c:type="GIOCondition"/>
+          <type name="IOCondition" c:type="GIOCondition"/>
         </parameter>
         <parameter name="func">
-          <type name="GIOFunc" c:type="GIOFunc"/>
+          <type name="IOFunc" c:type="GIOFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -11028,7 +10981,7 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="size">
           <type name="size" c:type="gsize"/>
@@ -11042,46 +10995,46 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_get_buffer_condition"
               c:identifier="g_io_channel_get_buffer_condition">
       <return-value>
-        <type name="GIOCondition" c:type="GIOCondition"/>
+        <type name="IOCondition" c:type="GIOCondition"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_set_flags"
               c:identifier="g_io_channel_set_flags">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GIOFlags" c:type="GIOFlags"/>
+          <type name="IOFlags" c:type="GIOFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_get_flags"
               c:identifier="g_io_channel_get_flags">
       <return-value>
-        <type name="GIOFlags" c:type="GIOFlags"/>
+        <type name="IOFlags" c:type="GIOFlags"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
@@ -11092,13 +11045,13 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="line_term">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -11109,10 +11062,10 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -11123,7 +11076,7 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="buffered">
           <type name="boolean" c:type="gboolean"/>
@@ -11137,24 +11090,24 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_set_encoding"
               c:identifier="g_io_channel_set_encoding">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="encoding">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11165,7 +11118,7 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
@@ -11176,7 +11129,7 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="do_close">
           <type name="boolean" c:type="gboolean"/>
@@ -11190,94 +11143,94 @@
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_flush" c:identifier="g_io_channel_flush">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_read_line"
               c:identifier="g_io_channel_read_line">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="str_return">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="terminator_pos">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_read_line_string"
               c:identifier="g_io_channel_read_line_string">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="buffer">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="terminator_pos">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_read_to_end"
               c:identifier="g_io_channel_read_to_end">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="str_return">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_read_chars"
               c:identifier="g_io_channel_read_chars">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="buf">
           <type name="string" c:type="gchar*"/>
@@ -11286,38 +11239,38 @@
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_read_unichar"
               c:identifier="g_io_channel_read_unichar">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="thechar">
-          <type name="gunichar" c:type="gunichar*"/>
+          <type name="unichar" c:type="gunichar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_write_chars"
               c:identifier="g_io_channel_write_chars">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="buf">
           <type name="string" c:type="gchar*"/>
@@ -11326,53 +11279,53 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_write_unichar"
               c:identifier="g_io_channel_write_unichar">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="thechar">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="unichar" c:type="gunichar"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_seek_position"
               c:identifier="g_io_channel_seek_position">
       <return-value>
-        <type name="GIOStatus" c:type="GIOStatus"/>
+        <type name="IOStatus" c:type="GIOStatus"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="offset">
-          <type name="gint64" c:type="gint64"/>
+          <type name="int64" c:type="gint64"/>
         </parameter>
         <parameter name="type">
-          <type name="GSeekType" c:type="GSeekType"/>
+          <type name="SeekType" c:type="GSeekType"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_new_file" c:identifier="g_io_channel_new_file">
       <return-value>
-        <type name="GIOChannel" c:type="GIOChannel*"/>
+        <type name="IOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
@@ -11382,30 +11335,30 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_error_quark"
               c:identifier="g_io_channel_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <function name="io_channel_error_from_errno"
               c:identifier="g_io_channel_error_from_errno">
       <return-value>
-        <type name="GIOChannelError" c:type="GIOChannelError"/>
+        <type name="IOChannelError" c:type="GIOChannelError"/>
       </return-value>
       <parameters>
         <parameter name="en">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_unix_new" c:identifier="g_io_channel_unix_new">
       <return-value>
-        <type name="GIOChannel" c:type="GIOChannel*"/>
+        <type name="IOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="fd">
@@ -11416,51 +11369,51 @@
     <function name="io_channel_unix_get_fd"
               c:identifier="g_io_channel_unix_get_fd">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="channel">
-          <type name="GIOChannel" c:type="GIOChannel*"/>
+          <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GKeyFileError" c:type="GKeyFileError">
-      <member name="r_unknown_encoding"
+    <enumeration name="KeyFileError" c:type="GKeyFileError">
+      <member name="runknownencoding"
               value="0"
               c:identifier="G_KEY_FILE_ERROR_UNKNOWN_ENCODING"/>
-      <member name="r_parse" value="1" c:identifier="G_KEY_FILE_ERROR_PARSE"/>
-      <member name="r_not_found"
+      <member name="rparse" value="1" c:identifier="G_KEY_FILE_ERROR_PARSE"/>
+      <member name="rnotfound"
               value="2"
               c:identifier="G_KEY_FILE_ERROR_NOT_FOUND"/>
-      <member name="r_key_not_found"
+      <member name="rkeynotfound"
               value="3"
               c:identifier="G_KEY_FILE_ERROR_KEY_NOT_FOUND"/>
-      <member name="r_group_not_found"
+      <member name="rgroupnotfound"
               value="4"
               c:identifier="G_KEY_FILE_ERROR_GROUP_NOT_FOUND"/>
-      <member name="r_invalid_value"
+      <member name="rinvalidvalue"
               value="5"
               c:identifier="G_KEY_FILE_ERROR_INVALID_VALUE"/>
     </enumeration>
     <function name="key_file_error_quark"
               c:identifier="g_key_file_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <record name="KeyFile" c:type="GKeyFile"/>
-    <enumeration name="GKeyFileFlags" c:type="GKeyFileFlags">
+    <enumeration name="KeyFileFlags" c:type="GKeyFileFlags">
       <member name="none" value="0" c:identifier="G_KEY_FILE_NONE"/>
-      <member name="keep_comments"
+      <member name="keepcomments"
               value="1"
               c:identifier="G_KEY_FILE_KEEP_COMMENTS"/>
-      <member name="keep_translations"
+      <member name="keeptranslations"
               value="2"
               c:identifier="G_KEY_FILE_KEEP_TRANSLATIONS"/>
     </enumeration>
     <function name="key_file_new" c:identifier="g_key_file_new">
       <return-value>
-        <type name="GKeyFile" c:type="GKeyFile*"/>
+        <type name="KeyFile" c:type="GKeyFile*"/>
       </return-value>
     </function>
     <function name="key_file_free" c:identifier="g_key_file_free">
@@ -11469,7 +11422,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -11480,10 +11433,10 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="separator">
-          <type name="gchar" c:type="gchar"/>
+          <type name="char" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -11494,16 +11447,16 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="file">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GKeyFileFlags" c:type="GKeyFileFlags"/>
+          <type name="KeyFileFlags" c:type="GKeyFileFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11514,7 +11467,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="data">
           <type name="string" c:type="gchar*"/>
@@ -11523,10 +11476,10 @@
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="flags">
-          <type name="GKeyFileFlags" c:type="GKeyFileFlags"/>
+          <type name="KeyFileFlags" c:type="GKeyFileFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11537,22 +11490,22 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="file">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="search_dirs">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="full_path">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
-          <type name="GKeyFileFlags" c:type="GKeyFileFlags"/>
+          <type name="KeyFileFlags" c:type="GKeyFileFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11563,19 +11516,19 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="file">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="full_path">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
-          <type name="GKeyFileFlags" c:type="GKeyFileFlags"/>
+          <type name="KeyFileFlags" c:type="GKeyFileFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11585,13 +11538,13 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11602,39 +11555,39 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
       </parameters>
     </function>
     <function name="key_file_get_groups" c:identifier="g_key_file_get_groups">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
     <function name="key_file_get_keys" c:identifier="g_key_file_get_keys">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11644,7 +11597,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11657,7 +11610,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11666,7 +11619,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11676,7 +11629,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11685,7 +11638,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11695,7 +11648,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11714,7 +11667,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11723,7 +11676,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11733,7 +11686,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11753,7 +11706,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11765,7 +11718,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11776,7 +11729,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11799,7 +11752,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11808,7 +11761,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11819,7 +11772,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11835,11 +11788,11 @@
     <function name="key_file_get_integer"
               c:identifier="g_key_file_get_integer">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11848,7 +11801,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11859,7 +11812,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11868,7 +11821,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="value">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -11878,7 +11831,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11887,7 +11840,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11897,7 +11850,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11913,11 +11866,11 @@
     <function name="key_file_get_string_list"
               c:identifier="g_key_file_get_string_list">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11926,10 +11879,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11940,7 +11893,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11959,11 +11912,11 @@
     <function name="key_file_get_locale_string_list"
               c:identifier="g_key_file_get_locale_string_list">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -11975,10 +11928,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -11989,7 +11942,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12011,11 +11964,11 @@
     <function name="key_file_get_boolean_list"
               c:identifier="g_key_file_get_boolean_list">
       <return-value>
-        <type name="gboolean" c:type="gboolean*"/>
+        <type name="boolean" c:type="gboolean*"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12024,10 +11977,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12038,7 +11991,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12057,11 +12010,11 @@
     <function name="key_file_get_integer_list"
               c:identifier="g_key_file_get_integer_list">
       <return-value>
-        <type name="gint" c:type="gint*"/>
+        <type name="int" c:type="gint*"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12070,10 +12023,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12084,7 +12037,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12103,11 +12056,11 @@
     <function name="key_file_get_double_list"
               c:identifier="g_key_file_get_double_list">
       <return-value>
-        <type name="gdouble" c:type="gdouble*"/>
+        <type name="double" c:type="gdouble*"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12116,10 +12069,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12130,7 +12083,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12139,7 +12092,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="list">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="length">
           <type name="size" c:type="gsize"/>
@@ -12153,7 +12106,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12165,7 +12118,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12176,7 +12129,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12185,7 +12138,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12196,7 +12149,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12205,7 +12158,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12215,7 +12168,7 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
@@ -12224,7 +12177,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12235,20 +12188,20 @@
       </return-value>
       <parameters>
         <parameter name="key_file">
-          <type name="GKeyFile" c:type="GKeyFile*"/>
+          <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="group_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <record name="MappedFile" c:type="GMappedFile"/>
     <function name="mapped_file_new" c:identifier="g_mapped_file_new">
       <return-value>
-        <type name="GMappedFile" c:type="GMappedFile*"/>
+        <type name="MappedFile" c:type="GMappedFile*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
@@ -12258,7 +12211,7 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12269,7 +12222,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GMappedFile" c:type="GMappedFile*"/>
+          <type name="MappedFile" c:type="GMappedFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -12280,7 +12233,7 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GMappedFile" c:type="GMappedFile*"/>
+          <type name="MappedFile" c:type="GMappedFile*"/>
         </parameter>
       </parameters>
     </function>
@@ -12290,80 +12243,79 @@
       </return-value>
       <parameters>
         <parameter name="file">
-          <type name="GMappedFile" c:type="GMappedFile*"/>
+          <type name="MappedFile" c:type="GMappedFile*"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GMarkupError" c:type="GMarkupError">
-      <member name="r_bad_utf8"
+    <enumeration name="MarkupError" c:type="GMarkupError">
+      <member name="rbadutf8"
               value="0"
               c:identifier="G_MARKUP_ERROR_BAD_UTF8"/>
-      <member name="r_empty" value="1" c:identifier="G_MARKUP_ERROR_EMPTY"/>
-      <member name="r_parse" value="2" c:identifier="G_MARKUP_ERROR_PARSE"/>
-      <member name="r_unknown_element"
+      <member name="rempty" value="1" c:identifier="G_MARKUP_ERROR_EMPTY"/>
+      <member name="rparse" value="2" c:identifier="G_MARKUP_ERROR_PARSE"/>
+      <member name="runknownelement"
               value="3"
               c:identifier="G_MARKUP_ERROR_UNKNOWN_ELEMENT"/>
-      <member name="r_unknown_attribute"
+      <member name="runknownattribute"
               value="4"
               c:identifier="G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE"/>
-      <member name="r_invalid_content"
+      <member name="rinvalidcontent"
               value="5"
               c:identifier="G_MARKUP_ERROR_INVALID_CONTENT"/>
-      <member name="r_missing_attribute"
+      <member name="rmissingattribute"
               value="6"
               c:identifier="G_MARKUP_ERROR_MISSING_ATTRIBUTE"/>
     </enumeration>
     <function name="markup_error_quark" c:identifier="g_markup_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
-    <enumeration name="GMarkupParseFlags" c:type="GMarkupParseFlags">
-      <member name="do_not_use_this_unsupported_flag"
+    <enumeration name="MarkupParseFlags" c:type="GMarkupParseFlags">
+      <member name="donotusethisunsupportedflag"
               value="1"
               c:identifier="G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG"/>
-      <member name="treat_cdata_as_text"
+      <member name="treatcdataastext"
               value="2"
               c:identifier="G_MARKUP_TREAT_CDATA_AS_TEXT"/>
-      <member name="refix_error_position"
+      <member name="refixerrorposition"
               value="4"
               c:identifier="G_MARKUP_PREFIX_ERROR_POSITION"/>
     </enumeration>
     <record name="MarkupParseContext" c:type="GMarkupParseContext"/>
-    <record name="MarkupParser" c:type="GMarkupParser"/>
-    <record name="GMarkupParser" c:type="_GMarkupParser">
-      <callback name="start_element">
+    <record name="MarkupParser" c:type="GMarkupParser">
+      <callback name="start_element" c:type="start_element">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+            <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="element_name">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="attribute_names">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="char" c:type="gchar**"/>
           </parameter>
           <parameter name="attribute_values">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="char" c:type="gchar**"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="end_element">
+      <callback name="end_element" c:type="end_element">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+            <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="element_name">
             <type name="string" c:type="gchar*"/>
@@ -12372,17 +12324,17 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text">
+      <callback name="text" c:type="text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+            <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -12394,17 +12346,17 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="passthrough">
+      <callback name="passthrough" c:type="passthrough">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+            <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="passthrough_text">
             <type name="string" c:type="gchar*"/>
@@ -12416,20 +12368,20 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="error">
+      <callback name="error" c:type="error">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+            <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError*"/>
+            <type name="Error" c:type="GError*"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -12440,20 +12392,20 @@
     <function name="markup_parse_context_new"
               c:identifier="g_markup_parse_context_new">
       <return-value>
-        <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+        <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
       </return-value>
       <parameters>
         <parameter name="parser">
-          <type name="GMarkupParser" c:type="GMarkupParser*"/>
+          <type name="MarkupParser" c:type="GMarkupParser*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GMarkupParseFlags" c:type="GMarkupParseFlags"/>
+          <type name="MarkupParseFlags" c:type="GMarkupParseFlags"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="user_data_dnotify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -12464,7 +12416,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+          <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -12475,7 +12427,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+          <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
         </parameter>
         <parameter name="text">
           <type name="string" c:type="gchar*"/>
@@ -12484,7 +12436,7 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12495,10 +12447,10 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+          <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -12509,18 +12461,18 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+          <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
         </parameter>
       </parameters>
     </function>
     <function name="markup_parse_context_get_element_stack"
               c:identifier="g_markup_parse_context_get_element_stack">
       <return-value>
-        <type name="GSList" c:type="GSList*"/>
+        <type name="SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+          <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -12531,13 +12483,13 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+          <type name="MarkupParseContext" c:type="GMarkupParseContext*"/>
         </parameter>
         <parameter name="line_number">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="char_number">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -12565,7 +12517,7 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GMarkupCollectType" c:type="GMarkupCollectType">
+    <enumeration name="MarkupCollectType" c:type="GMarkupCollectType">
       <member name="invalid"
               value="0"
               c:identifier="G_MARKUP_COLLECT_INVALID"/>
@@ -12591,27 +12543,27 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="attribute_names">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="attribute_values">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
         <parameter name="first_type">
-          <type name="GMarkupCollectType" c:type="GMarkupCollectType"/>
+          <type name="MarkupCollectType" c:type="GMarkupCollectType"/>
         </parameter>
         <parameter name="first_attr">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GLogLevelFlags" c:type="GLogLevelFlags">
-      <member name="flag_recursion"
+    <enumeration name="LogLevelFlags" c:type="GLogLevelFlags">
+      <member name="flagrecursion"
               value="1"
               c:identifier="G_LOG_FLAG_RECURSION"/>
-      <member name="flag_fatal" value="2" c:identifier="G_LOG_FLAG_FATAL"/>
+      <member name="flagfatal" value="2" c:identifier="G_LOG_FLAG_FATAL"/>
       <member name="error" value="4" c:identifier="G_LOG_LEVEL_ERROR"/>
       <member name="critical" value="8" c:identifier="G_LOG_LEVEL_CRITICAL"/>
       <member name="warning" value="16" c:identifier="G_LOG_LEVEL_WARNING"/>
@@ -12620,7 +12572,7 @@
       <member name="debug" value="128" c:identifier="G_LOG_LEVEL_DEBUG"/>
       <member name="mask" value="-4" c:identifier="G_LOG_LEVEL_MASK"/>
     </enumeration>
-    <callback name="GLogFunc">
+    <callback name="LogFunc" c:type="GLogFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -12629,7 +12581,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="log_level">
-          <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+          <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
         </parameter>
         <parameter name="message">
           <type name="string" c:type="gchar*"/>
@@ -12641,17 +12593,17 @@
     </callback>
     <function name="log_set_handler" c:identifier="g_log_set_handler">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="log_domain">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="log_levels">
-          <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+          <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
         </parameter>
         <parameter name="log_func">
-          <type name="GLogFunc" c:type="GLogFunc"/>
+          <type name="LogFunc" c:type="GLogFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -12667,7 +12619,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="handler_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -12680,7 +12632,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="log_level">
-          <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+          <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
         </parameter>
         <parameter name="message">
           <type name="string" c:type="gchar*"/>
@@ -12693,11 +12645,11 @@
     <function name="log_set_default_handler"
               c:identifier="g_log_set_default_handler">
       <return-value>
-        <type name="GLogFunc" c:type="GLogFunc"/>
+        <type name="LogFunc" c:type="GLogFunc"/>
       </return-value>
       <parameters>
         <parameter name="log_func">
-          <type name="GLogFunc" c:type="GLogFunc"/>
+          <type name="LogFunc" c:type="GLogFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -12713,7 +12665,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="log_level">
-          <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+          <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -12722,29 +12674,29 @@
     </function>
     <function name="log_set_fatal_mask" c:identifier="g_log_set_fatal_mask">
       <return-value>
-        <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+        <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
       </return-value>
       <parameters>
         <parameter name="log_domain">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="fatal_mask">
-          <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+          <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
         </parameter>
       </parameters>
     </function>
     <function name="log_set_always_fatal"
               c:identifier="g_log_set_always_fatal">
       <return-value>
-        <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+        <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
       </return-value>
       <parameters>
         <parameter name="fatal_mask">
-          <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+          <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="g_log_fallback_handler"
+    <function name="log_fallback_handler"
               c:identifier="_g_log_fallback_handler">
       <return-value>
         <type name="none" c:type="void"/>
@@ -12754,7 +12706,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="log_level">
-          <type name="GLogLevelFlags" c:type="GLogLevelFlags"/>
+          <type name="LogLevelFlags" c:type="GLogLevelFlags"/>
         </parameter>
         <parameter name="message">
           <type name="string" c:type="gchar*"/>
@@ -12825,7 +12777,7 @@
         </parameter>
       </parameters>
     </function>
-    <callback name="GPrintFunc">
+    <callback name="PrintFunc" c:type="GPrintFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -12847,11 +12799,11 @@
     </function>
     <function name="set_print_handler" c:identifier="g_set_print_handler">
       <return-value>
-        <type name="GPrintFunc" c:type="GPrintFunc"/>
+        <type name="PrintFunc" c:type="GPrintFunc"/>
       </return-value>
       <parameters>
         <parameter name="func">
-          <type name="GPrintFunc" c:type="GPrintFunc"/>
+          <type name="PrintFunc" c:type="GPrintFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -12868,58 +12820,72 @@
     <function name="set_printerr_handler"
               c:identifier="g_set_printerr_handler">
       <return-value>
-        <type name="GPrintFunc" c:type="GPrintFunc"/>
+        <type name="PrintFunc" c:type="GPrintFunc"/>
       </return-value>
       <parameters>
         <parameter name="func">
-          <type name="GPrintFunc" c:type="GPrintFunc"/>
+          <type name="PrintFunc" c:type="GPrintFunc"/>
         </parameter>
       </parameters>
     </function>
-    <record name="Node" c:type="GNode"/>
-    <enumeration name="GTraverseFlags" c:type="GTraverseFlags">
+    <record name="Node" c:type="GNode">
+      <field name="data">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="next">
+        <type name="Node" c:type="GNode*"/>
+      </field>
+      <field name="prev">
+        <type name="Node" c:type="GNode*"/>
+      </field>
+      <field name="parent">
+        <type name="Node" c:type="GNode*"/>
+      </field>
+      <field name="children">
+        <type name="Node" c:type="GNode*"/>
+      </field>
+    </record>
+    <enumeration name="TraverseFlags" c:type="GTraverseFlags">
       <member name="leaves" value="1" c:identifier="G_TRAVERSE_LEAVES"/>
-      <member name="non_leaves"
-              value="2"
-              c:identifier="G_TRAVERSE_NON_LEAVES"/>
+      <member name="nonleaves" value="2" c:identifier="G_TRAVERSE_NON_LEAVES"/>
       <member name="all" value="3" c:identifier="G_TRAVERSE_ALL"/>
       <member name="mask" value="3" c:identifier="G_TRAVERSE_MASK"/>
       <member name="leafs" value="1" c:identifier="G_TRAVERSE_LEAFS"/>
-      <member name="non_leafs" value="2" c:identifier="G_TRAVERSE_NON_LEAFS"/>
+      <member name="nonleafs" value="2" c:identifier="G_TRAVERSE_NON_LEAFS"/>
     </enumeration>
-    <enumeration name="GTraverseType" c:type="GTraverseType">
-      <member name="in_order" value="0" c:identifier="G_IN_ORDER"/>
-      <member name="pre_order" value="1" c:identifier="G_PRE_ORDER"/>
-      <member name="post_order" value="2" c:identifier="G_POST_ORDER"/>
-      <member name="level_order" value="3" c:identifier="G_LEVEL_ORDER"/>
+    <enumeration name="TraverseType" c:type="GTraverseType">
+      <member name="inorder" value="0" c:identifier="G_IN_ORDER"/>
+      <member name="preorder" value="1" c:identifier="G_PRE_ORDER"/>
+      <member name="postorder" value="2" c:identifier="G_POST_ORDER"/>
+      <member name="levelorder" value="3" c:identifier="G_LEVEL_ORDER"/>
     </enumeration>
-    <callback name="GNodeTraverseFunc">
+    <callback name="NodeTraverseFunc" c:type="GNodeTraverseFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GNodeForeachFunc">
+    <callback name="NodeForeachFunc" c:type="GNodeForeachFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GCopyFunc">
+    <callback name="CopyFunc" c:type="GCopyFunc">
       <return-value>
         <type name="any" c:type="gpointer"/>
       </return-value>
@@ -12932,26 +12898,9 @@
         </parameter>
       </parameters>
     </callback>
-    <record name="GNode" c:type="_GNode">
-      <field name="data">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="next">
-        <type name="GNode" c:type="GNode*"/>
-      </field>
-      <field name="prev">
-        <type name="GNode" c:type="GNode*"/>
-      </field>
-      <field name="parent">
-        <type name="GNode" c:type="GNode*"/>
-      </field>
-      <field name="children">
-        <type name="GNode" c:type="GNode*"/>
-      </field>
-    </record>
     <function name="node_new" c:identifier="g_node_new">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="data">
@@ -12965,7 +12914,7 @@
       </return-value>
       <parameters>
         <parameter name="root">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
@@ -12975,20 +12924,20 @@
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_copy_deep" c:identifier="g_node_copy_deep">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="copy_func">
-          <type name="GCopyFunc" c:type="GCopyFunc"/>
+          <type name="CopyFunc" c:type="GCopyFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -12997,95 +12946,95 @@
     </function>
     <function name="node_copy" c:identifier="g_node_copy">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_insert" c:identifier="g_node_insert">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_insert_before" c:identifier="g_node_insert_before">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_insert_after" c:identifier="g_node_insert_after">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_prepend" c:identifier="g_node_prepend">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_n_nodes" c:identifier="g_node_n_nodes">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="root">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GTraverseFlags" c:type="GTraverseFlags"/>
+          <type name="TraverseFlags" c:type="GTraverseFlags"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_get_root" c:identifier="g_node_get_root">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
@@ -13095,36 +13044,36 @@
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="descendant">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_depth" c:identifier="g_node_depth">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_find" c:identifier="g_node_find">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="root">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="order">
-          <type name="GTraverseType" c:type="GTraverseType"/>
+          <type name="TraverseType" c:type="GTraverseType"/>
         </parameter>
         <parameter name="flags">
-          <type name="GTraverseFlags" c:type="GTraverseFlags"/>
+          <type name="TraverseFlags" c:type="GTraverseFlags"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -13137,19 +13086,19 @@
       </return-value>
       <parameters>
         <parameter name="root">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="order">
-          <type name="GTraverseType" c:type="GTraverseType"/>
+          <type name="TraverseType" c:type="GTraverseType"/>
         </parameter>
         <parameter name="flags">
-          <type name="GTraverseFlags" c:type="GTraverseFlags"/>
+          <type name="TraverseFlags" c:type="GTraverseFlags"/>
         </parameter>
         <parameter name="max_depth">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="func">
-          <type name="GNodeTraverseFunc" c:type="GNodeTraverseFunc"/>
+          <type name="NodeTraverseFunc" c:type="GNodeTraverseFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -13158,11 +13107,11 @@
     </function>
     <function name="node_max_height" c:identifier="g_node_max_height">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="root">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
@@ -13173,13 +13122,13 @@
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GTraverseFlags" c:type="GTraverseFlags"/>
+          <type name="TraverseFlags" c:type="GTraverseFlags"/>
         </parameter>
         <parameter name="func">
-          <type name="GNodeForeachFunc" c:type="GNodeForeachFunc"/>
+          <type name="NodeForeachFunc" c:type="GNodeForeachFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -13193,53 +13142,53 @@
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_n_children" c:identifier="g_node_n_children">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_nth_child" c:identifier="g_node_nth_child">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_last_child" c:identifier="g_node_last_child">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_find_child" c:identifier="g_node_find_child">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="flags">
-          <type name="GTraverseFlags" c:type="GTraverseFlags"/>
+          <type name="TraverseFlags" c:type="GTraverseFlags"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -13248,24 +13197,24 @@
     </function>
     <function name="node_child_position" c:identifier="g_node_child_position">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="child">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_child_index" c:identifier="g_node_child_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -13274,21 +13223,21 @@
     </function>
     <function name="node_first_sibling" c:identifier="g_node_first_sibling">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
     <function name="node_last_sibling" c:identifier="g_node_last_sibling">
       <return-value>
-        <type name="GNode" c:type="GNode*"/>
+        <type name="Node" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="Node" c:type="GNode*"/>
         </parameter>
       </parameters>
     </function>
@@ -13309,40 +13258,58 @@
     </function>
     <record name="OptionContext" c:type="GOptionContext"/>
     <record name="OptionGroup" c:type="GOptionGroup"/>
-    <record name="OptionEntry" c:type="GOptionEntry"/>
-    <enumeration name="GOptionFlags" c:type="GOptionFlags">
-      <member name="_hidden" value="1" c:identifier="G_OPTION_FLAG_HIDDEN"/>
-      <member name="_in_main" value="2" c:identifier="G_OPTION_FLAG_IN_MAIN"/>
-      <member name="_reverse" value="4" c:identifier="G_OPTION_FLAG_REVERSE"/>
-      <member name="_no_arg" value="8" c:identifier="G_OPTION_FLAG_NO_ARG"/>
-      <member name="_filename"
+    <record name="OptionEntry" c:type="GOptionEntry">
+      <field name="long_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="short_name">
+        <type name="char" c:type="gchar"/>
+      </field>
+      <field name="flags">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="arg">
+        <type name="OptionArg" c:type="GOptionArg"/>
+      </field>
+      <field name="arg_data">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="description">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="arg_description">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <enumeration name="OptionFlags" c:type="GOptionFlags">
+      <member name="hidden" value="1" c:identifier="G_OPTION_FLAG_HIDDEN"/>
+      <member name="inmain" value="2" c:identifier="G_OPTION_FLAG_IN_MAIN"/>
+      <member name="reverse" value="4" c:identifier="G_OPTION_FLAG_REVERSE"/>
+      <member name="noarg" value="8" c:identifier="G_OPTION_FLAG_NO_ARG"/>
+      <member name="filename"
               value="16"
               c:identifier="G_OPTION_FLAG_FILENAME"/>
-      <member name="_optional_arg"
+      <member name="optionalarg"
               value="32"
               c:identifier="G_OPTION_FLAG_OPTIONAL_ARG"/>
-      <member name="_noalias" value="64" c:identifier="G_OPTION_FLAG_NOALIAS"/>
+      <member name="noalias" value="64" c:identifier="G_OPTION_FLAG_NOALIAS"/>
     </enumeration>
-    <enumeration name="GOptionArg" c:type="GOptionArg">
-      <member name="g_none" value="0" c:identifier="G_OPTION_ARG_NONE"/>
-      <member name="g_string" value="1" c:identifier="G_OPTION_ARG_STRING"/>
-      <member name="g_int" value="2" c:identifier="G_OPTION_ARG_INT"/>
-      <member name="g_callback"
-              value="3"
-              c:identifier="G_OPTION_ARG_CALLBACK"/>
-      <member name="g_filename"
-              value="4"
-              c:identifier="G_OPTION_ARG_FILENAME"/>
-      <member name="g_string_array"
+    <enumeration name="OptionArg" c:type="GOptionArg">
+      <member name="gnone" value="0" c:identifier="G_OPTION_ARG_NONE"/>
+      <member name="gstring" value="1" c:identifier="G_OPTION_ARG_STRING"/>
+      <member name="gint" value="2" c:identifier="G_OPTION_ARG_INT"/>
+      <member name="gcallback" value="3" c:identifier="G_OPTION_ARG_CALLBACK"/>
+      <member name="gfilename" value="4" c:identifier="G_OPTION_ARG_FILENAME"/>
+      <member name="gstringarray"
               value="5"
               c:identifier="G_OPTION_ARG_STRING_ARRAY"/>
-      <member name="g_filename_array"
+      <member name="gfilenamearray"
               value="6"
               c:identifier="G_OPTION_ARG_FILENAME_ARRAY"/>
-      <member name="g_double" value="7" c:identifier="G_OPTION_ARG_DOUBLE"/>
-      <member name="g_int64" value="8" c:identifier="G_OPTION_ARG_INT64"/>
+      <member name="gdouble" value="7" c:identifier="G_OPTION_ARG_DOUBLE"/>
+      <member name="gint64" value="8" c:identifier="G_OPTION_ARG_INT64"/>
     </enumeration>
-    <callback name="GOptionArgFunc">
+    <callback name="OptionArgFunc" c:type="GOptionArgFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -13357,88 +13324,65 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GOptionParseFunc">
+    <callback name="OptionParseFunc" c:type="GOptionParseFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GOptionErrorFunc">
+    <callback name="OptionErrorFunc" c:type="GOptionErrorFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
-    <enumeration name="GOptionError" c:type="GOptionError">
-      <member name="r_unknown_option"
+    <enumeration name="OptionError" c:type="GOptionError">
+      <member name="runknownoption"
               value="0"
               c:identifier="G_OPTION_ERROR_UNKNOWN_OPTION"/>
-      <member name="r_bad_value"
+      <member name="rbadvalue"
               value="1"
               c:identifier="G_OPTION_ERROR_BAD_VALUE"/>
-      <member name="r_failed" value="2" c:identifier="G_OPTION_ERROR_FAILED"/>
+      <member name="rfailed" value="2" c:identifier="G_OPTION_ERROR_FAILED"/>
     </enumeration>
     <function name="option_error_quark" c:identifier="g_option_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
-    <record name="GOptionEntry" c:type="_GOptionEntry">
-      <field name="long_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="short_name">
-        <type name="gchar" c:type="gchar"/>
-      </field>
-      <field name="flags">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="arg">
-        <type name="GOptionArg" c:type="GOptionArg"/>
-      </field>
-      <field name="arg_data">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="description">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="arg_description">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
     <function name="option_context_new" c:identifier="g_option_context_new">
       <return-value>
-        <type name="GOptionContext" c:type="GOptionContext*"/>
+        <type name="OptionContext" c:type="GOptionContext*"/>
       </return-value>
       <parameters>
         <parameter name="parameter_string">
@@ -13453,7 +13397,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="summary">
           <type name="string" c:type="gchar*"/>
@@ -13467,7 +13411,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -13478,7 +13422,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="description">
           <type name="string" c:type="gchar*"/>
@@ -13492,7 +13436,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -13502,7 +13446,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -13513,7 +13457,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="help_enabled">
           <type name="boolean" c:type="gboolean"/>
@@ -13527,7 +13471,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -13538,7 +13482,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="ignore_unknown">
           <type name="boolean" c:type="gboolean"/>
@@ -13552,7 +13496,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -13563,10 +13507,10 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="entries">
-          <type name="GOptionEntry" c:type="GOptionEntry*"/>
+          <type name="OptionEntry" c:type="GOptionEntry*"/>
         </parameter>
         <parameter name="translation_domain">
           <type name="string" c:type="gchar*"/>
@@ -13580,16 +13524,16 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="argc">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="char" c:type="gchar***"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -13600,16 +13544,16 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="func">
-          <type name="GTranslateFunc" c:type="GTranslateFunc"/>
+          <type name="TranslateFunc" c:type="GTranslateFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy_notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -13620,7 +13564,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="domain">
           <type name="string" c:type="gchar*"/>
@@ -13634,10 +13578,10 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
       </parameters>
     </function>
@@ -13648,21 +13592,21 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
       </parameters>
     </function>
     <function name="option_context_get_main_group"
               c:identifier="g_option_context_get_main_group">
       <return-value>
-        <type name="GOptionGroup" c:type="GOptionGroup*"/>
+        <type name="OptionGroup" c:type="GOptionGroup*"/>
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -13673,19 +13617,19 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext" c:type="GOptionContext*"/>
+          <type name="OptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="main_help">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
       </parameters>
     </function>
     <function name="option_group_new" c:identifier="g_option_group_new">
       <return-value>
-        <type name="GOptionGroup" c:type="GOptionGroup*"/>
+        <type name="OptionGroup" c:type="GOptionGroup*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -13701,7 +13645,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -13712,13 +13656,13 @@
       </return-value>
       <parameters>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="pre_parse_func">
-          <type name="GOptionParseFunc" c:type="GOptionParseFunc"/>
+          <type name="OptionParseFunc" c:type="GOptionParseFunc"/>
         </parameter>
         <parameter name="post_parse_func">
-          <type name="GOptionParseFunc" c:type="GOptionParseFunc"/>
+          <type name="OptionParseFunc" c:type="GOptionParseFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -13729,10 +13673,10 @@
       </return-value>
       <parameters>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="error_func">
-          <type name="GOptionErrorFunc" c:type="GOptionErrorFunc"/>
+          <type name="OptionErrorFunc" c:type="GOptionErrorFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -13742,7 +13686,7 @@
       </return-value>
       <parameters>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
       </parameters>
     </function>
@@ -13753,10 +13697,10 @@
       </return-value>
       <parameters>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="entries">
-          <type name="GOptionEntry" c:type="GOptionEntry*"/>
+          <type name="OptionEntry" c:type="GOptionEntry*"/>
         </parameter>
       </parameters>
     </function>
@@ -13767,16 +13711,16 @@
       </return-value>
       <parameters>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="func">
-          <type name="GTranslateFunc" c:type="GTranslateFunc"/>
+          <type name="TranslateFunc" c:type="GTranslateFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy_notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -13787,7 +13731,7 @@
       </return-value>
       <parameters>
         <parameter name="group">
-          <type name="GOptionGroup" c:type="GOptionGroup*"/>
+          <type name="OptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="domain">
           <type name="string" c:type="gchar*"/>
@@ -13797,7 +13741,7 @@
     <record name="PatternSpec" c:type="GPatternSpec"/>
     <function name="pattern_spec_new" c:identifier="g_pattern_spec_new">
       <return-value>
-        <type name="GPatternSpec" c:type="GPatternSpec*"/>
+        <type name="PatternSpec" c:type="GPatternSpec*"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -13811,7 +13755,7 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GPatternSpec" c:type="GPatternSpec*"/>
+          <type name="PatternSpec" c:type="GPatternSpec*"/>
         </parameter>
       </parameters>
     </function>
@@ -13821,10 +13765,10 @@
       </return-value>
       <parameters>
         <parameter name="pspec1">
-          <type name="GPatternSpec" c:type="GPatternSpec*"/>
+          <type name="PatternSpec" c:type="GPatternSpec*"/>
         </parameter>
         <parameter name="pspec2">
-          <type name="GPatternSpec" c:type="GPatternSpec*"/>
+          <type name="PatternSpec" c:type="GPatternSpec*"/>
         </parameter>
       </parameters>
     </function>
@@ -13834,10 +13778,10 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GPatternSpec" c:type="GPatternSpec*"/>
+          <type name="PatternSpec" c:type="GPatternSpec*"/>
         </parameter>
         <parameter name="string_length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -13854,7 +13798,7 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GPatternSpec" c:type="GPatternSpec*"/>
+          <type name="PatternSpec" c:type="GPatternSpec*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -13878,17 +13822,17 @@
     <function name="spaced_primes_closest"
               c:identifier="g_spaced_primes_closest">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="num">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="printf" c:identifier="g_printf">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="format">
@@ -13898,7 +13842,7 @@
     </function>
     <function name="sprintf" c:identifier="g_sprintf">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -13918,34 +13862,33 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="total_elems">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="size">
           <type name="size" c:type="gsize"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <record name="Queue" c:type="GQueue"/>
-    <record name="GQueue" c:type="_GQueue">
+    <record name="Queue" c:type="GQueue">
       <field name="head">
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </field>
       <field name="tail">
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </field>
       <field name="length">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
     <function name="queue_new" c:identifier="g_queue_new">
       <return-value>
-        <type name="GQueue" c:type="GQueue*"/>
+        <type name="Queue" c:type="GQueue*"/>
       </return-value>
     </function>
     <function name="queue_free" c:identifier="g_queue_free">
@@ -13954,7 +13897,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -13964,7 +13907,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -13974,7 +13917,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -13984,17 +13927,17 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_get_length" c:identifier="g_queue_get_length">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -14004,17 +13947,17 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_copy" c:identifier="g_queue_copy">
       <return-value>
-        <type name="GQueue" c:type="GQueue*"/>
+        <type name="Queue" c:type="GQueue*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -14024,10 +13967,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -14036,11 +13979,11 @@
     </function>
     <function name="queue_find" c:identifier="g_queue_find">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -14049,17 +13992,17 @@
     </function>
     <function name="queue_find_custom" c:identifier="g_queue_find_custom">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -14069,10 +14012,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -14085,7 +14028,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -14098,7 +14041,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -14111,13 +14054,13 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="n">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -14127,7 +14070,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -14137,7 +14080,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -14147,10 +14090,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -14160,7 +14103,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -14170,7 +14113,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
@@ -14180,20 +14123,20 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_index" c:identifier="g_queue_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -14206,7 +14149,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -14219,7 +14162,7 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gconstpointer"/>
@@ -14232,10 +14175,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -14248,10 +14191,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -14264,13 +14207,13 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -14284,10 +14227,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -14298,10 +14241,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -14311,94 +14254,94 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="n">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="link_">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_pop_head_link" c:identifier="g_queue_pop_head_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_pop_tail_link" c:identifier="g_queue_pop_tail_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_pop_nth_link" c:identifier="g_queue_pop_nth_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_peek_head_link"
               c:identifier="g_queue_peek_head_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_peek_tail_link"
               c:identifier="g_queue_peek_tail_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_peek_nth_link" c:identifier="g_queue_peek_nth_link">
       <return-value>
-        <type name="GList" c:type="GList*"/>
+        <type name="List" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="n">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="queue_link_index" c:identifier="g_queue_link_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -14408,10 +14351,10 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -14421,17 +14364,17 @@
       </return-value>
       <parameters>
         <parameter name="queue">
-          <type name="GQueue" c:type="GQueue*"/>
+          <type name="Queue" c:type="GQueue*"/>
         </parameter>
         <parameter name="link_">
-          <type name="GList" c:type="GList*"/>
+          <type name="List" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <record name="Rand" c:type="GRand"/>
     <function name="rand_new_with_seed" c:identifier="g_rand_new_with_seed">
       <return-value>
-        <type name="GRand" c:type="GRand*"/>
+        <type name="Rand" c:type="GRand*"/>
       </return-value>
       <parameters>
         <parameter name="seed">
@@ -14442,20 +14385,20 @@
     <function name="rand_new_with_seed_array"
               c:identifier="g_rand_new_with_seed_array">
       <return-value>
-        <type name="GRand" c:type="GRand*"/>
+        <type name="Rand" c:type="GRand*"/>
       </return-value>
       <parameters>
         <parameter name="seed">
-          <type name="guint32" c:type="guint32*"/>
+          <type name="uint32" c:type="guint32*"/>
         </parameter>
         <parameter name="seed_length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="rand_new" c:identifier="g_rand_new">
       <return-value>
-        <type name="GRand" c:type="GRand*"/>
+        <type name="Rand" c:type="GRand*"/>
       </return-value>
     </function>
     <function name="rand_free" c:identifier="g_rand_free">
@@ -14464,17 +14407,17 @@
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rand_copy" c:identifier="g_rand_copy">
       <return-value>
-        <type name="GRand" c:type="GRand*"/>
+        <type name="Rand" c:type="GRand*"/>
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
       </parameters>
     </function>
@@ -14484,7 +14427,7 @@
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
         <parameter name="seed">
           <type name="uint32" c:type="guint32"/>
@@ -14497,13 +14440,13 @@
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
         <parameter name="seed">
-          <type name="guint32" c:type="guint32*"/>
+          <type name="uint32" c:type="guint32*"/>
         </parameter>
         <parameter name="seed_length">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -14513,7 +14456,7 @@
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
       </parameters>
     </function>
@@ -14523,7 +14466,7 @@
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
         <parameter name="begin">
           <type name="int32" c:type="gint32"/>
@@ -14539,7 +14482,7 @@
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
       </parameters>
     </function>
@@ -14549,7 +14492,7 @@
       </return-value>
       <parameters>
         <parameter name="rand_">
-          <type name="GRand" c:type="GRand*"/>
+          <type name="Rand" c:type="GRand*"/>
         </parameter>
         <parameter name="begin">
           <type name="double" c:type="gdouble"/>
@@ -14605,160 +14548,160 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GRegexError" c:type="GRegexError">
-      <member name="r_compile" value="0" c:identifier="G_REGEX_ERROR_COMPILE"/>
-      <member name="r_optimize"
+    <enumeration name="RegexError" c:type="GRegexError">
+      <member name="rcompile" value="0" c:identifier="G_REGEX_ERROR_COMPILE"/>
+      <member name="roptimize"
               value="1"
               c:identifier="G_REGEX_ERROR_OPTIMIZE"/>
-      <member name="r_replace" value="2" c:identifier="G_REGEX_ERROR_REPLACE"/>
-      <member name="r_match" value="3" c:identifier="G_REGEX_ERROR_MATCH"/>
-      <member name="r_internal"
+      <member name="rreplace" value="2" c:identifier="G_REGEX_ERROR_REPLACE"/>
+      <member name="rmatch" value="3" c:identifier="G_REGEX_ERROR_MATCH"/>
+      <member name="rinternal"
               value="4"
               c:identifier="G_REGEX_ERROR_INTERNAL"/>
-      <member name="r_stray_backslash"
+      <member name="rstraybackslash"
               value="101"
               c:identifier="G_REGEX_ERROR_STRAY_BACKSLASH"/>
-      <member name="r_missing_control_char"
+      <member name="rmissingcontrolchar"
               value="102"
               c:identifier="G_REGEX_ERROR_MISSING_CONTROL_CHAR"/>
-      <member name="r_unrecognized_escape"
+      <member name="runrecognizedescape"
               value="103"
               c:identifier="G_REGEX_ERROR_UNRECOGNIZED_ESCAPE"/>
-      <member name="r_quantifiers_out_of_order"
+      <member name="rquantifiersoutoforder"
               value="104"
               c:identifier="G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER"/>
-      <member name="r_quantifier_too_big"
+      <member name="rquantifiertoobig"
               value="105"
               c:identifier="G_REGEX_ERROR_QUANTIFIER_TOO_BIG"/>
-      <member name="r_unterminated_character_class"
+      <member name="runterminatedcharacterclass"
               value="106"
               c:identifier="G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS"/>
-      <member name="r_invalid_escape_in_character_class"
+      <member name="rinvalidescapeincharacterclass"
               value="107"
               c:identifier="G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS"/>
-      <member name="r_range_out_of_order"
+      <member name="rrangeoutoforder"
               value="108"
               c:identifier="G_REGEX_ERROR_RANGE_OUT_OF_ORDER"/>
-      <member name="r_nothing_to_repeat"
+      <member name="rnothingtorepeat"
               value="109"
               c:identifier="G_REGEX_ERROR_NOTHING_TO_REPEAT"/>
-      <member name="r_unrecognized_character"
+      <member name="runrecognizedcharacter"
               value="112"
               c:identifier="G_REGEX_ERROR_UNRECOGNIZED_CHARACTER"/>
-      <member name="r_posix_named_class_outside_class"
+      <member name="rposixnamedclassoutsideclass"
               value="113"
               c:identifier="G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS"/>
-      <member name="r_unmatched_parenthesis"
+      <member name="runmatchedparenthesis"
               value="114"
               c:identifier="G_REGEX_ERROR_UNMATCHED_PARENTHESIS"/>
-      <member name="r_inexistent_subpattern_reference"
+      <member name="rinexistentsubpatternreference"
               value="115"
               c:identifier="G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE"/>
-      <member name="r_unterminated_comment"
+      <member name="runterminatedcomment"
               value="118"
               c:identifier="G_REGEX_ERROR_UNTERMINATED_COMMENT"/>
-      <member name="r_expression_too_large"
+      <member name="rexpressiontoolarge"
               value="120"
               c:identifier="G_REGEX_ERROR_EXPRESSION_TOO_LARGE"/>
-      <member name="r_memory_error"
+      <member name="rmemoryerror"
               value="121"
               c:identifier="G_REGEX_ERROR_MEMORY_ERROR"/>
-      <member name="r_variable_length_lookbehind"
+      <member name="rvariablelengthlookbehind"
               value="125"
               c:identifier="G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND"/>
-      <member name="r_malformed_condition"
+      <member name="rmalformedcondition"
               value="126"
               c:identifier="G_REGEX_ERROR_MALFORMED_CONDITION"/>
-      <member name="r_too_many_conditional_branches"
+      <member name="rtoomanyconditionalbranches"
               value="127"
               c:identifier="G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES"/>
-      <member name="r_assertion_expected"
+      <member name="rassertionexpected"
               value="128"
               c:identifier="G_REGEX_ERROR_ASSERTION_EXPECTED"/>
-      <member name="r_unknown_posix_class_name"
+      <member name="runknownposixclassname"
               value="130"
               c:identifier="G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME"/>
-      <member name="r_posix_collating_elements_not_supported"
+      <member name="rposixcollatingelementsnotsupported"
               value="131"
               c:identifier="G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED"/>
-      <member name="r_hex_code_too_large"
+      <member name="rhexcodetoolarge"
               value="134"
               c:identifier="G_REGEX_ERROR_HEX_CODE_TOO_LARGE"/>
-      <member name="r_invalid_condition"
+      <member name="rinvalidcondition"
               value="135"
               c:identifier="G_REGEX_ERROR_INVALID_CONDITION"/>
-      <member name="r_single_byte_match_in_lookbehind"
+      <member name="rsinglebytematchinlookbehind"
               value="136"
               c:identifier="G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND"/>
-      <member name="r_infinite_loop"
+      <member name="rinfiniteloop"
               value="140"
               c:identifier="G_REGEX_ERROR_INFINITE_LOOP"/>
-      <member name="r_missing_subpattern_name_terminator"
+      <member name="rmissingsubpatternnameterminator"
               value="142"
               c:identifier="G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR"/>
-      <member name="r_duplicate_subpattern_name"
+      <member name="rduplicatesubpatternname"
               value="143"
               c:identifier="G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME"/>
-      <member name="r_malformed_property"
+      <member name="rmalformedproperty"
               value="146"
               c:identifier="G_REGEX_ERROR_MALFORMED_PROPERTY"/>
-      <member name="r_unknown_property"
+      <member name="runknownproperty"
               value="147"
               c:identifier="G_REGEX_ERROR_UNKNOWN_PROPERTY"/>
-      <member name="r_subpattern_name_too_long"
+      <member name="rsubpatternnametoolong"
               value="148"
               c:identifier="G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG"/>
-      <member name="r_too_many_subpatterns"
+      <member name="rtoomanysubpatterns"
               value="149"
               c:identifier="G_REGEX_ERROR_TOO_MANY_SUBPATTERNS"/>
-      <member name="r_invalid_octal_value"
+      <member name="rinvalidoctalvalue"
               value="151"
               c:identifier="G_REGEX_ERROR_INVALID_OCTAL_VALUE"/>
-      <member name="r_too_many_branches_in_define"
+      <member name="rtoomanybranchesindefine"
               value="154"
               c:identifier="G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE"/>
-      <member name="r_define_repetion"
+      <member name="rdefinerepetion"
               value="155"
               c:identifier="G_REGEX_ERROR_DEFINE_REPETION"/>
-      <member name="r_inconsistent_newline_options"
+      <member name="rinconsistentnewlineoptions"
               value="156"
               c:identifier="G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS"/>
-      <member name="r_missing_back_reference"
+      <member name="rmissingbackreference"
               value="157"
               c:identifier="G_REGEX_ERROR_MISSING_BACK_REFERENCE"/>
     </enumeration>
     <function name="regex_error_quark" c:identifier="g_regex_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
-    <enumeration name="GRegexCompileFlags" c:type="GRegexCompileFlags">
+    <enumeration name="RegexCompileFlags" c:type="GRegexCompileFlags">
       <member name="aseless" value="1" c:identifier="G_REGEX_CASELESS"/>
       <member name="multiline" value="2" c:identifier="G_REGEX_MULTILINE"/>
       <member name="dotall" value="4" c:identifier="G_REGEX_DOTALL"/>
       <member name="extended" value="8" c:identifier="G_REGEX_EXTENDED"/>
       <member name="anchored" value="16" c:identifier="G_REGEX_ANCHORED"/>
-      <member name="dollar_endonly"
+      <member name="dollarendonly"
               value="32"
               c:identifier="G_REGEX_DOLLAR_ENDONLY"/>
       <member name="ungreedy" value="512" c:identifier="G_REGEX_UNGREEDY"/>
       <member name="raw" value="2048" c:identifier="G_REGEX_RAW"/>
-      <member name="no_auto_capture"
+      <member name="noautocapture"
               value="4096"
               c:identifier="G_REGEX_NO_AUTO_CAPTURE"/>
       <member name="optimize" value="8192" c:identifier="G_REGEX_OPTIMIZE"/>
       <member name="dupnames" value="524288" c:identifier="G_REGEX_DUPNAMES"/>
-      <member name="newline_cr"
+      <member name="newlinecr"
               value="1048576"
               c:identifier="G_REGEX_NEWLINE_CR"/>
-      <member name="newline_lf"
+      <member name="newlinelf"
               value="2097152"
               c:identifier="G_REGEX_NEWLINE_LF"/>
-      <member name="newline_crlf"
+      <member name="newlinecrlf"
               value="3145728"
               c:identifier="G_REGEX_NEWLINE_CRLF"/>
     </enumeration>
-    <enumeration name="GRegexMatchFlags" c:type="GRegexMatchFlags">
+    <enumeration name="RegexMatchFlags" c:type="GRegexMatchFlags">
       <member name="anchored"
               value="16"
               c:identifier="G_REGEX_MATCH_ANCHORED"/>
@@ -14770,31 +14713,31 @@
       <member name="partial"
               value="32768"
               c:identifier="G_REGEX_MATCH_PARTIAL"/>
-      <member name="newline_cr"
+      <member name="newlinecr"
               value="1048576"
               c:identifier="G_REGEX_MATCH_NEWLINE_CR"/>
-      <member name="newline_lf"
+      <member name="newlinelf"
               value="2097152"
               c:identifier="G_REGEX_MATCH_NEWLINE_LF"/>
-      <member name="newline_crlf"
+      <member name="newlinecrlf"
               value="3145728"
               c:identifier="G_REGEX_MATCH_NEWLINE_CRLF"/>
-      <member name="newline_any"
+      <member name="newlineany"
               value="4194304"
               c:identifier="G_REGEX_MATCH_NEWLINE_ANY"/>
     </enumeration>
     <record name="Regex" c:type="GRegex"/>
     <record name="MatchInfo" c:type="GMatchInfo"/>
-    <callback name="GRegexEvalCallback">
+    <callback name="RegexEvalCallback" c:type="GRegexEvalCallback">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="result">
-          <type name="GString" c:type="GString*"/>
+          <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -14803,30 +14746,30 @@
     </callback>
     <function name="regex_new" c:identifier="g_regex_new">
       <return-value>
-        <type name="GRegex" c:type="GRegex*"/>
+        <type name="Regex" c:type="GRegex*"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="compile_options">
-          <type name="GRegexCompileFlags" c:type="GRegexCompileFlags"/>
+          <type name="RegexCompileFlags" c:type="GRegexCompileFlags"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="regex_ref" c:identifier="g_regex_ref">
       <return-value>
-        <type name="GRegex" c:type="GRegex*"/>
+        <type name="Regex" c:type="GRegex*"/>
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
       </parameters>
     </function>
@@ -14836,7 +14779,7 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
       </parameters>
     </function>
@@ -14846,40 +14789,40 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
       </parameters>
     </function>
     <function name="regex_get_max_backref"
               c:identifier="g_regex_get_max_backref">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
       </parameters>
     </function>
     <function name="regex_get_capture_count"
               c:identifier="g_regex_get_capture_count">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
       </parameters>
     </function>
     <function name="regex_get_string_number"
               c:identifier="g_regex_get_string_number">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
@@ -14895,7 +14838,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -14911,10 +14854,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="compile_options">
-          <type name="GRegexCompileFlags" c:type="GRegexCompileFlags"/>
+          <type name="RegexCompileFlags" c:type="GRegexCompileFlags"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
       </parameters>
     </function>
@@ -14924,16 +14867,16 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo**"/>
+          <type name="MatchInfo" c:type="GMatchInfo**"/>
         </parameter>
       </parameters>
     </function>
@@ -14943,7 +14886,7 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -14952,16 +14895,16 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo**"/>
+          <type name="MatchInfo" c:type="GMatchInfo**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -14971,16 +14914,16 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo**"/>
+          <type name="MatchInfo" c:type="GMatchInfo**"/>
         </parameter>
       </parameters>
     </function>
@@ -14991,7 +14934,7 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -15000,22 +14943,22 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo**"/>
+          <type name="MatchInfo" c:type="GMatchInfo**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="regex_split_simple" c:identifier="g_regex_split_simple">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -15025,36 +14968,36 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="compile_options">
-          <type name="GRegexCompileFlags" c:type="GRegexCompileFlags"/>
+          <type name="RegexCompileFlags" c:type="GRegexCompileFlags"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
       </parameters>
     </function>
     <function name="regex_split" c:identifier="g_regex_split">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
       </parameters>
     </function>
     <function name="regex_split_full" c:identifier="g_regex_split_full">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -15063,16 +15006,16 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="max_tokens">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -15082,7 +15025,7 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -15091,16 +15034,16 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="replacement">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -15111,7 +15054,7 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -15120,16 +15063,16 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="replacement">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -15139,7 +15082,7 @@
       </return-value>
       <parameters>
         <parameter name="regex">
-          <type name="GRegex" c:type="GRegex*"/>
+          <type name="Regex" c:type="GRegex*"/>
         </parameter>
         <parameter name="string">
           <type name="string" c:type="gchar*"/>
@@ -15148,19 +15091,19 @@
           <type name="ssize" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="match_options">
-          <type name="GRegexMatchFlags" c:type="GRegexMatchFlags"/>
+          <type name="RegexMatchFlags" c:type="GRegexMatchFlags"/>
         </parameter>
         <parameter name="eval">
-          <type name="GRegexEvalCallback" c:type="GRegexEvalCallback"/>
+          <type name="RegexEvalCallback" c:type="GRegexEvalCallback"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -15174,21 +15117,21 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="has_references">
-          <type name="gboolean" c:type="gboolean*"/>
+          <type name="boolean" c:type="gboolean*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="match_info_get_regex"
               c:identifier="g_match_info_get_regex">
       <return-value>
-        <type name="GRegex" c:type="GRegex*"/>
+        <type name="Regex" c:type="GRegex*"/>
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -15199,7 +15142,7 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -15209,7 +15152,7 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -15219,10 +15162,10 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -15232,18 +15175,18 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
       </parameters>
     </function>
     <function name="match_info_get_match_count"
               c:identifier="g_match_info_get_match_count">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -15254,7 +15197,7 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -15265,13 +15208,13 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="string_to_expand">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -15281,10 +15224,10 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="match_num">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -15295,16 +15238,16 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="match_num">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="start_pos">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end_pos">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -15315,7 +15258,7 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
@@ -15329,44 +15272,43 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="start_pos">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end_pos">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="match_info_fetch_all"
               c:identifier="g_match_info_fetch_all">
       <return-value>
-        <type name="gchar" c:type="gchar**"/>
+        <type name="char" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo" c:type="GMatchInfo*"/>
+          <type name="MatchInfo" c:type="GMatchInfo*"/>
         </parameter>
       </parameters>
     </function>
     <record name="Relation" c:type="GRelation"/>
-    <record name="Tuples" c:type="GTuples"/>
-    <record name="GTuples" c:type="_GTuples">
+    <record name="Tuples" c:type="GTuples">
       <field name="len">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
     <function name="relation_new" c:identifier="g_relation_new">
       <return-value>
-        <type name="GRelation" c:type="GRelation*"/>
+        <type name="Relation" c:type="GRelation*"/>
       </return-value>
       <parameters>
         <parameter name="fields">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -15376,7 +15318,7 @@
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
       </parameters>
     </function>
@@ -15386,16 +15328,16 @@
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
         <parameter name="field">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="hash_func">
-          <type name="GHashFunc" c:type="GHashFunc"/>
+          <type name="HashFunc" c:type="GHashFunc"/>
         </parameter>
         <parameter name="key_equal_func">
-          <type name="GEqualFunc" c:type="GEqualFunc"/>
+          <type name="EqualFunc" c:type="GEqualFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -15405,55 +15347,55 @@
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
       </parameters>
     </function>
     <function name="relation_delete" c:identifier="g_relation_delete">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="field">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="relation_select" c:identifier="g_relation_select">
       <return-value>
-        <type name="GTuples" c:type="GTuples*"/>
+        <type name="Tuples" c:type="GTuples*"/>
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="field">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="relation_count" c:identifier="g_relation_count">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="field">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -15463,7 +15405,7 @@
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
       </parameters>
     </function>
@@ -15473,7 +15415,7 @@
       </return-value>
       <parameters>
         <parameter name="relation">
-          <type name="GRelation" c:type="GRelation*"/>
+          <type name="Relation" c:type="GRelation*"/>
         </parameter>
       </parameters>
     </function>
@@ -15483,7 +15425,7 @@
       </return-value>
       <parameters>
         <parameter name="tuples">
-          <type name="GTuples" c:type="GTuples*"/>
+          <type name="Tuples" c:type="GTuples*"/>
         </parameter>
       </parameters>
     </function>
@@ -15493,85 +15435,82 @@
       </return-value>
       <parameters>
         <parameter name="tuples">
-          <type name="GTuples" c:type="GTuples*"/>
+          <type name="Tuples" c:type="GTuples*"/>
         </parameter>
         <parameter name="index_">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="field">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <record name="Scanner" c:type="GScanner"/>
-    <record name="ScannerConfig" c:type="GScannerConfig"/>
-    <callback name="GScannerMsgFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
-        </parameter>
-        <parameter name="message">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <enumeration name="GErrorType" c:type="GErrorType">
-      <member name="_unknown" value="0" c:identifier="G_ERR_UNKNOWN"/>
-      <member name="_unexp_eof" value="1" c:identifier="G_ERR_UNEXP_EOF"/>
-      <member name="_unexp_eof_in_string"
-              value="2"
-              c:identifier="G_ERR_UNEXP_EOF_IN_STRING"/>
-      <member name="_unexp_eof_in_comment"
-              value="3"
-              c:identifier="G_ERR_UNEXP_EOF_IN_COMMENT"/>
-      <member name="_non_digit_in_const"
-              value="4"
-              c:identifier="G_ERR_NON_DIGIT_IN_CONST"/>
-      <member name="_digit_radix" value="5" c:identifier="G_ERR_DIGIT_RADIX"/>
-      <member name="_float_radix" value="6" c:identifier="G_ERR_FLOAT_RADIX"/>
-      <member name="_float_malformed"
-              value="7"
-              c:identifier="G_ERR_FLOAT_MALFORMED"/>
-    </enumeration>
-    <enumeration name="GTokenType" c:type="GTokenType">
-      <member name="eof" value="0" c:identifier="G_TOKEN_EOF"/>
-      <member name="left_paren" value="0" c:identifier="G_TOKEN_LEFT_PAREN"/>
-      <member name="right_paren" value="0" c:identifier="G_TOKEN_RIGHT_PAREN"/>
-      <member name="left_curly" value="0" c:identifier="G_TOKEN_LEFT_CURLY"/>
-      <member name="right_curly" value="0" c:identifier="G_TOKEN_RIGHT_CURLY"/>
-      <member name="left_brace" value="0" c:identifier="G_TOKEN_LEFT_BRACE"/>
-      <member name="right_brace" value="0" c:identifier="G_TOKEN_RIGHT_BRACE"/>
-      <member name="equal_sign" value="0" c:identifier="G_TOKEN_EQUAL_SIGN"/>
-      <member name="comma" value="0" c:identifier="G_TOKEN_COMMA"/>
-      <member name="none" value="256" c:identifier="G_TOKEN_NONE"/>
-      <member name="error" value="257" c:identifier="G_TOKEN_ERROR"/>
-      <member name="char" value="258" c:identifier="G_TOKEN_CHAR"/>
-      <member name="binary" value="259" c:identifier="G_TOKEN_BINARY"/>
-      <member name="octal" value="260" c:identifier="G_TOKEN_OCTAL"/>
-      <member name="int" value="261" c:identifier="G_TOKEN_INT"/>
-      <member name="hex" value="262" c:identifier="G_TOKEN_HEX"/>
-      <member name="float" value="263" c:identifier="G_TOKEN_FLOAT"/>
-      <member name="string" value="264" c:identifier="G_TOKEN_STRING"/>
-      <member name="symbol" value="265" c:identifier="G_TOKEN_SYMBOL"/>
-      <member name="identifier" value="266" c:identifier="G_TOKEN_IDENTIFIER"/>
-      <member name="identifier_null"
-              value="267"
-              c:identifier="G_TOKEN_IDENTIFIER_NULL"/>
-      <member name="comment_single"
-              value="268"
-              c:identifier="G_TOKEN_COMMENT_SINGLE"/>
-      <member name="comment_multi"
-              value="269"
-              c:identifier="G_TOKEN_COMMENT_MULTI"/>
-      <member name="last" value="270" c:identifier="G_TOKEN_LAST"/>
-    </enumeration>
-    <record name="GScannerConfig" c:type="_GScannerConfig">
+    <record name="Scanner" c:type="GScanner">
+      <field name="user_data">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="max_parse_errors">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="parse_errors">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="input_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="qdata">
+        <type name="Data" c:type="GData*"/>
+      </field>
+      <field name="config">
+        <type name="ScannerConfig" c:type="GScannerConfig*"/>
+      </field>
+      <field name="token">
+        <type name="TokenType" c:type="GTokenType"/>
+      </field>
+      <field name="value">
+        <type name="TokenValue" c:type="GTokenValue"/>
+      </field>
+      <field name="line">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="position">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="next_token">
+        <type name="TokenType" c:type="GTokenType"/>
+      </field>
+      <field name="next_value">
+        <type name="TokenValue" c:type="GTokenValue"/>
+      </field>
+      <field name="next_line">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="next_position">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="symbol_table">
+        <type name="HashTable" c:type="GHashTable*"/>
+      </field>
+      <field name="input_fd">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="text_end">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="buffer">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="scope_id">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="msg_handler">
+        <type name="ScannerMsgFunc" c:type="GScannerMsgFunc"/>
+      </field>
+    </record>
+    <record name="ScannerConfig" c:type="GScannerConfig">
       <field name="cset_skip_characters">
         <type name="string" c:type="gchar*"/>
       </field>
@@ -15585,147 +15524,148 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="case_sensitive">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="skip_comment_multi">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="skip_comment_single">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_comment_multi">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_identifier">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_identifier_1char">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_identifier_NULL">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_symbols">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_binary">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_octal">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_float">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_hex">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_hex_dollar">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_string_sq">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scan_string_dq">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="numbers_2_int">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="int_2_float">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="identifier_2_string">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="char_2_token">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="symbol_2_token">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="scope_0_fallback">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="store_int64">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="padding_dummy">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GScanner" c:type="_GScanner">
-      <field name="user_data">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="max_parse_errors">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="parse_errors">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="input_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="qdata">
-        <type name="GData" c:type="GData*"/>
-      </field>
-      <field name="config">
-        <type name="GScannerConfig" c:type="GScannerConfig*"/>
-      </field>
-      <field name="token">
-        <type name="GTokenType" c:type="GTokenType"/>
-      </field>
-      <field name="value">
-        <type name="GTokenValue" c:type="GTokenValue"/>
-      </field>
-      <field name="line">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="position">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="next_token">
-        <type name="GTokenType" c:type="GTokenType"/>
-      </field>
-      <field name="next_value">
-        <type name="GTokenValue" c:type="GTokenValue"/>
-      </field>
-      <field name="next_line">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="next_position">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="symbol_table">
-        <type name="GHashTable" c:type="GHashTable*"/>
-      </field>
-      <field name="input_fd">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="text">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="text_end">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="buffer">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="scope_id">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="msg_handler">
-        <type name="GScannerMsgFunc" c:type="GScannerMsgFunc"/>
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
+    <callback name="ScannerMsgFunc" c:type="GScannerMsgFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="scanner">
+          <type name="Scanner" c:type="GScanner*"/>
+        </parameter>
+        <parameter name="message">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <enumeration name="ErrorType" c:type="GErrorType">
+      <member name="unknown" value="0" c:identifier="G_ERR_UNKNOWN"/>
+      <member name="unexpeof" value="1" c:identifier="G_ERR_UNEXP_EOF"/>
+      <member name="unexpeofinstring"
+              value="2"
+              c:identifier="G_ERR_UNEXP_EOF_IN_STRING"/>
+      <member name="unexpeofincomment"
+              value="3"
+              c:identifier="G_ERR_UNEXP_EOF_IN_COMMENT"/>
+      <member name="nondigitinconst"
+              value="4"
+              c:identifier="G_ERR_NON_DIGIT_IN_CONST"/>
+      <member name="digitradix" value="5" c:identifier="G_ERR_DIGIT_RADIX"/>
+      <member name="floatradix" value="6" c:identifier="G_ERR_FLOAT_RADIX"/>
+      <member name="floatmalformed"
+              value="7"
+              c:identifier="G_ERR_FLOAT_MALFORMED"/>
+    </enumeration>
+    <enumeration name="TokenType" c:type="GTokenType">
+      <member name="eof" value="0" c:identifier="G_TOKEN_EOF"/>
+      <member name="leftparen" value="0" c:identifier="G_TOKEN_LEFT_PAREN"/>
+      <member name="rightparen" value="0" c:identifier="G_TOKEN_RIGHT_PAREN"/>
+      <member name="leftcurly" value="0" c:identifier="G_TOKEN_LEFT_CURLY"/>
+      <member name="rightcurly" value="0" c:identifier="G_TOKEN_RIGHT_CURLY"/>
+      <member name="leftbrace" value="0" c:identifier="G_TOKEN_LEFT_BRACE"/>
+      <member name="rightbrace" value="0" c:identifier="G_TOKEN_RIGHT_BRACE"/>
+      <member name="equalsign" value="0" c:identifier="G_TOKEN_EQUAL_SIGN"/>
+      <member name="comma" value="0" c:identifier="G_TOKEN_COMMA"/>
+      <member name="none" value="256" c:identifier="G_TOKEN_NONE"/>
+      <member name="error" value="257" c:identifier="G_TOKEN_ERROR"/>
+      <member name="char" value="258" c:identifier="G_TOKEN_CHAR"/>
+      <member name="binary" value="259" c:identifier="G_TOKEN_BINARY"/>
+      <member name="octal" value="260" c:identifier="G_TOKEN_OCTAL"/>
+      <member name="int" value="261" c:identifier="G_TOKEN_INT"/>
+      <member name="hex" value="262" c:identifier="G_TOKEN_HEX"/>
+      <member name="float" value="263" c:identifier="G_TOKEN_FLOAT"/>
+      <member name="string" value="264" c:identifier="G_TOKEN_STRING"/>
+      <member name="symbol" value="265" c:identifier="G_TOKEN_SYMBOL"/>
+      <member name="identifier" value="266" c:identifier="G_TOKEN_IDENTIFIER"/>
+      <member name="identifiernull"
+              value="267"
+              c:identifier="G_TOKEN_IDENTIFIER_NULL"/>
+      <member name="commentsingle"
+              value="268"
+              c:identifier="G_TOKEN_COMMENT_SINGLE"/>
+      <member name="commentmulti"
+              value="269"
+              c:identifier="G_TOKEN_COMMENT_MULTI"/>
+      <member name="last" value="270" c:identifier="G_TOKEN_LAST"/>
+    </enumeration>
     <function name="scanner_new" c:identifier="g_scanner_new">
       <return-value>
-        <type name="GScanner" c:type="GScanner*"/>
+        <type name="Scanner" c:type="GScanner*"/>
       </return-value>
       <parameters>
         <parameter name="config_templ">
-          <type name="GScannerConfig" c:type="GScannerConfig*"/>
+          <type name="ScannerConfig" c:type="GScannerConfig*"/>
         </parameter>
       </parameters>
     </function>
@@ -15735,7 +15675,7 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
@@ -15745,10 +15685,10 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="input_fd">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -15759,7 +15699,7 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
@@ -15769,76 +15709,76 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="text">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="text_len">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="scanner_get_next_token"
               c:identifier="g_scanner_get_next_token">
       <return-value>
-        <type name="GTokenType" c:type="GTokenType"/>
+        <type name="TokenType" c:type="GTokenType"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
     <function name="scanner_peek_next_token"
               c:identifier="g_scanner_peek_next_token">
       <return-value>
-        <type name="GTokenType" c:type="GTokenType"/>
+        <type name="TokenType" c:type="GTokenType"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
     <function name="scanner_cur_token" c:identifier="g_scanner_cur_token">
       <return-value>
-        <type name="GTokenType" c:type="GTokenType"/>
+        <type name="TokenType" c:type="GTokenType"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
     <function name="scanner_cur_value" c:identifier="g_scanner_cur_value">
       <return-value>
-        <type name="GTokenValue" c:type="GTokenValue"/>
+        <type name="TokenValue" c:type="GTokenValue"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
     <function name="scanner_cur_line" c:identifier="g_scanner_cur_line">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
     <function name="scanner_cur_position"
               c:identifier="g_scanner_cur_position">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
@@ -15848,20 +15788,20 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
     <function name="scanner_set_scope" c:identifier="g_scanner_set_scope">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="scope_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -15872,10 +15812,10 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="scope_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="symbol">
           <type name="string" c:type="gchar*"/>
@@ -15892,10 +15832,10 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="scope_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="symbol">
           <type name="string" c:type="gchar*"/>
@@ -15909,10 +15849,10 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="scope_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="symbol">
           <type name="string" c:type="gchar*"/>
@@ -15926,13 +15866,13 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="scope_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="func">
-          <type name="GHFunc" c:type="GHFunc"/>
+          <type name="HFunc" c:type="GHFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -15946,7 +15886,7 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="symbol">
           <type name="string" c:type="gchar*"/>
@@ -15959,10 +15899,10 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="expected_token">
-          <type name="GTokenType" c:type="GTokenType"/>
+          <type name="TokenType" c:type="GTokenType"/>
         </parameter>
         <parameter name="identifier_spec">
           <type name="string" c:type="gchar*"/>
@@ -15977,7 +15917,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="is_error">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -15987,7 +15927,7 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -16000,7 +15940,7 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="Scanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -16009,16 +15949,16 @@
     </function>
     <record name="Sequence" c:type="GSequence"/>
     <record name="SequenceIter" c:type="GSequenceIter"/>
-    <callback name="GSequenceIterCompareFunc">
+    <callback name="SequenceIterCompareFunc" c:type="GSequenceIterCompareFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="a">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="b">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -16027,11 +15967,11 @@
     </callback>
     <function name="sequence_new" c:identifier="g_sequence_new">
       <return-value>
-        <type name="GSequence" c:type="GSequence*"/>
+        <type name="Sequence" c:type="GSequence*"/>
       </return-value>
       <parameters>
         <parameter name="data_destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -16041,17 +15981,17 @@
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_get_length" c:identifier="g_sequence_get_length">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
       </parameters>
     </function>
@@ -16061,10 +16001,10 @@
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -16078,13 +16018,13 @@
       </return-value>
       <parameters>
         <parameter name="begin">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="end">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -16097,10 +16037,10 @@
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="cmp_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="cmp_data">
           <type name="any" c:type="gpointer"/>
@@ -16113,10 +16053,10 @@
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="cmp_func">
-          <type name="GSequenceIterCompareFunc"
+          <type name="SequenceIterCompareFunc"
                 c:type="GSequenceIterCompareFunc"/>
         </parameter>
         <parameter name="cmp_data">
@@ -16127,46 +16067,46 @@
     <function name="sequence_get_begin_iter"
               c:identifier="g_sequence_get_begin_iter">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_get_end_iter"
               c:identifier="g_sequence_get_end_iter">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_get_iter_at_pos"
               c:identifier="g_sequence_get_iter_at_pos">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="pos">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_append" c:identifier="g_sequence_append">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -16175,11 +16115,11 @@
     </function>
     <function name="sequence_prepend" c:identifier="g_sequence_prepend">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -16189,11 +16129,11 @@
     <function name="sequence_insert_before"
               c:identifier="g_sequence_insert_before">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -16206,10 +16146,10 @@
       </return-value>
       <parameters>
         <parameter name="src">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="dest">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -16219,27 +16159,27 @@
       </return-value>
       <parameters>
         <parameter name="a">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="b">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_insert_sorted"
               c:identifier="g_sequence_insert_sorted">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="cmp_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="cmp_data">
           <type name="any" c:type="gpointer"/>
@@ -16249,17 +16189,17 @@
     <function name="sequence_insert_sorted_iter"
               c:identifier="g_sequence_insert_sorted_iter">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="iter_cmp">
-          <type name="GSequenceIterCompareFunc"
+          <type name="SequenceIterCompareFunc"
                 c:type="GSequenceIterCompareFunc"/>
         </parameter>
         <parameter name="cmp_data">
@@ -16274,10 +16214,10 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="cmp_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="cmp_data">
           <type name="any" c:type="gpointer"/>
@@ -16291,10 +16231,10 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="iter_cmp">
-          <type name="GSequenceIterCompareFunc"
+          <type name="SequenceIterCompareFunc"
                 c:type="GSequenceIterCompareFunc"/>
         </parameter>
         <parameter name="cmp_data">
@@ -16308,7 +16248,7 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -16319,10 +16259,10 @@
       </return-value>
       <parameters>
         <parameter name="begin">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="end">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -16332,29 +16272,29 @@
       </return-value>
       <parameters>
         <parameter name="dest">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="begin">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="end">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_search" c:identifier="g_sequence_search">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="cmp_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="cmp_data">
           <type name="any" c:type="gpointer"/>
@@ -16364,17 +16304,17 @@
     <function name="sequence_search_iter"
               c:identifier="g_sequence_search_iter">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
-          <type name="GSequence" c:type="GSequence*"/>
+          <type name="Sequence" c:type="GSequence*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="iter_cmp">
-          <type name="GSequenceIterCompareFunc"
+          <type name="SequenceIterCompareFunc"
                 c:type="GSequenceIterCompareFunc"/>
         </parameter>
         <parameter name="cmp_data">
@@ -16388,7 +16328,7 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -16398,7 +16338,7 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -16412,7 +16352,7 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -16423,105 +16363,105 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_iter_next" c:identifier="g_sequence_iter_next">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_iter_prev" c:identifier="g_sequence_iter_prev">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_iter_get_position"
               c:identifier="g_sequence_iter_get_position">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_iter_move" c:identifier="g_sequence_iter_move">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="delta">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_iter_get_sequence"
               c:identifier="g_sequence_iter_get_sequence">
       <return-value>
-        <type name="GSequence" c:type="GSequence*"/>
+        <type name="Sequence" c:type="GSequence*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_iter_compare"
               c:identifier="g_sequence_iter_compare">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="a">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="b">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
     <function name="sequence_range_get_midpoint"
               c:identifier="g_sequence_range_get_midpoint">
       <return-value>
-        <type name="GSequenceIter" c:type="GSequenceIter*"/>
+        <type name="SequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="begin">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="end">
-          <type name="GSequenceIter" c:type="GSequenceIter*"/>
+          <type name="SequenceIter" c:type="GSequenceIter*"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GShellError" c:type="GShellError">
-      <member name="r_bad_quoting"
+    <enumeration name="ShellError" c:type="GShellError">
+      <member name="rbadquoting"
               value="0"
               c:identifier="G_SHELL_ERROR_BAD_QUOTING"/>
-      <member name="r_empty_string"
+      <member name="remptystring"
               value="1"
               c:identifier="G_SHELL_ERROR_EMPTY_STRING"/>
-      <member name="r_failed" value="2" c:identifier="G_SHELL_ERROR_FAILED"/>
+      <member name="rfailed" value="2" c:identifier="G_SHELL_ERROR_FAILED"/>
     </enumeration>
     <function name="shell_error_quark" c:identifier="g_shell_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <function name="shell_quote" c:identifier="g_shell_quote">
@@ -16543,7 +16483,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16556,43 +16496,41 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argcp">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="argvp">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="char" c:type="gchar***"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GSpawnError" c:type="GSpawnError">
-      <member name="r_fork" value="0" c:identifier="G_SPAWN_ERROR_FORK"/>
-      <member name="r_read" value="1" c:identifier="G_SPAWN_ERROR_READ"/>
-      <member name="r_chdir" value="2" c:identifier="G_SPAWN_ERROR_CHDIR"/>
-      <member name="r_acces" value="3" c:identifier="G_SPAWN_ERROR_ACCES"/>
-      <member name="r_perm" value="4" c:identifier="G_SPAWN_ERROR_PERM"/>
-      <member name="r_2big" value="5" c:identifier="G_SPAWN_ERROR_2BIG"/>
-      <member name="r_noexec" value="6" c:identifier="G_SPAWN_ERROR_NOEXEC"/>
-      <member name="r_nametoolong"
+    <enumeration name="SpawnError" c:type="GSpawnError">
+      <member name="rfork" value="0" c:identifier="G_SPAWN_ERROR_FORK"/>
+      <member name="rread" value="1" c:identifier="G_SPAWN_ERROR_READ"/>
+      <member name="rchdir" value="2" c:identifier="G_SPAWN_ERROR_CHDIR"/>
+      <member name="racces" value="3" c:identifier="G_SPAWN_ERROR_ACCES"/>
+      <member name="rperm" value="4" c:identifier="G_SPAWN_ERROR_PERM"/>
+      <member name="r2big" value="5" c:identifier="G_SPAWN_ERROR_2BIG"/>
+      <member name="rnoexec" value="6" c:identifier="G_SPAWN_ERROR_NOEXEC"/>
+      <member name="rnametoolong"
               value="7"
               c:identifier="G_SPAWN_ERROR_NAMETOOLONG"/>
-      <member name="r_noent" value="8" c:identifier="G_SPAWN_ERROR_NOENT"/>
-      <member name="r_nomem" value="9" c:identifier="G_SPAWN_ERROR_NOMEM"/>
-      <member name="r_notdir" value="10" c:identifier="G_SPAWN_ERROR_NOTDIR"/>
-      <member name="r_loop" value="11" c:identifier="G_SPAWN_ERROR_LOOP"/>
-      <member name="r_txtbusy"
-              value="12"
-              c:identifier="G_SPAWN_ERROR_TXTBUSY"/>
-      <member name="r_io" value="13" c:identifier="G_SPAWN_ERROR_IO"/>
-      <member name="r_nfile" value="14" c:identifier="G_SPAWN_ERROR_NFILE"/>
-      <member name="r_mfile" value="15" c:identifier="G_SPAWN_ERROR_MFILE"/>
-      <member name="r_inval" value="16" c:identifier="G_SPAWN_ERROR_INVAL"/>
-      <member name="r_isdir" value="17" c:identifier="G_SPAWN_ERROR_ISDIR"/>
-      <member name="r_libbad" value="18" c:identifier="G_SPAWN_ERROR_LIBBAD"/>
-      <member name="r_failed" value="19" c:identifier="G_SPAWN_ERROR_FAILED"/>
+      <member name="rnoent" value="8" c:identifier="G_SPAWN_ERROR_NOENT"/>
+      <member name="rnomem" value="9" c:identifier="G_SPAWN_ERROR_NOMEM"/>
+      <member name="rnotdir" value="10" c:identifier="G_SPAWN_ERROR_NOTDIR"/>
+      <member name="rloop" value="11" c:identifier="G_SPAWN_ERROR_LOOP"/>
+      <member name="rtxtbusy" value="12" c:identifier="G_SPAWN_ERROR_TXTBUSY"/>
+      <member name="rio" value="13" c:identifier="G_SPAWN_ERROR_IO"/>
+      <member name="rnfile" value="14" c:identifier="G_SPAWN_ERROR_NFILE"/>
+      <member name="rmfile" value="15" c:identifier="G_SPAWN_ERROR_MFILE"/>
+      <member name="rinval" value="16" c:identifier="G_SPAWN_ERROR_INVAL"/>
+      <member name="risdir" value="17" c:identifier="G_SPAWN_ERROR_ISDIR"/>
+      <member name="rlibbad" value="18" c:identifier="G_SPAWN_ERROR_LIBBAD"/>
+      <member name="rfailed" value="19" c:identifier="G_SPAWN_ERROR_FAILED"/>
     </enumeration>
-    <callback name="GSpawnChildSetupFunc">
+    <callback name="SpawnChildSetupFunc" c:type="GSpawnChildSetupFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -16602,30 +16540,30 @@
         </parameter>
       </parameters>
     </callback>
-    <enumeration name="GSpawnFlags" c:type="GSpawnFlags">
-      <member name="leave_descriptors_open"
+    <enumeration name="SpawnFlags" c:type="GSpawnFlags">
+      <member name="leavedescriptorsopen"
               value="1"
               c:identifier="G_SPAWN_LEAVE_DESCRIPTORS_OPEN"/>
-      <member name="do_not_reap_child"
+      <member name="donotreapchild"
               value="2"
               c:identifier="G_SPAWN_DO_NOT_REAP_CHILD"/>
-      <member name="search_path" value="4" c:identifier="G_SPAWN_SEARCH_PATH"/>
-      <member name="stdout_to_dev_null"
+      <member name="searchpath" value="4" c:identifier="G_SPAWN_SEARCH_PATH"/>
+      <member name="stdouttodevnull"
               value="8"
               c:identifier="G_SPAWN_STDOUT_TO_DEV_NULL"/>
-      <member name="stderr_to_dev_null"
+      <member name="stderrtodevnull"
               value="16"
               c:identifier="G_SPAWN_STDERR_TO_DEV_NULL"/>
-      <member name="child_inherits_stdin"
+      <member name="childinheritsstdin"
               value="32"
               c:identifier="G_SPAWN_CHILD_INHERITS_STDIN"/>
-      <member name="ile_and_argv_zero"
+      <member name="ileandargvzero"
               value="64"
               c:identifier="G_SPAWN_FILE_AND_ARGV_ZERO"/>
     </enumeration>
     <function name="spawn_error_quark" c:identifier="g_spawn_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <function name="spawn_async" c:identifier="g_spawn_async">
@@ -16637,25 +16575,25 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="envp">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
-          <type name="GSpawnFlags" c:type="GSpawnFlags"/>
+          <type name="SpawnFlags" c:type="GSpawnFlags"/>
         </parameter>
         <parameter name="child_setup">
-          <type name="GSpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
+          <type name="SpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
-          <type name="GPid" c:type="GPid*"/>
+          <type name="Pid" c:type="GPid*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16669,34 +16607,34 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="envp">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
-          <type name="GSpawnFlags" c:type="GSpawnFlags"/>
+          <type name="SpawnFlags" c:type="GSpawnFlags"/>
         </parameter>
         <parameter name="child_setup">
-          <type name="GSpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
+          <type name="SpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
-          <type name="GPid" c:type="GPid*"/>
+          <type name="Pid" c:type="GPid*"/>
         </parameter>
         <parameter name="standard_input">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="standard_output">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="standard_error">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16709,31 +16647,31 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="envp">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
-          <type name="GSpawnFlags" c:type="GSpawnFlags"/>
+          <type name="SpawnFlags" c:type="GSpawnFlags"/>
         </parameter>
         <parameter name="child_setup">
-          <type name="GSpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
+          <type name="SpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="standard_output">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="standard_error">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="exit_status">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16747,16 +16685,16 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="standard_output">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="standard_error">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="char" c:type="gchar**"/>
         </parameter>
         <parameter name="exit_status">
-          <type name="gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16770,7 +16708,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16780,7 +16718,7 @@
       </return-value>
       <parameters>
         <parameter name="pid">
-          <type name="GPid" c:type="GPid"/>
+          <type name="Pid" c:type="GPid"/>
         </parameter>
       </parameters>
     </function>
@@ -16827,10 +16765,9 @@
         </parameter>
       </parameters>
     </function>
-    <record name="ThreadPool" c:type="GThreadPool"/>
-    <record name="GThreadPool" c:type="_GThreadPool">
+    <record name="ThreadPool" c:type="GThreadPool">
       <field name="func">
-        <type name="GFunc" c:type="GFunc"/>
+        <type name="Func" c:type="GFunc"/>
       </field>
       <field name="user_data">
         <type name="any" c:type="gpointer"/>
@@ -16841,23 +16778,23 @@
     </record>
     <function name="thread_pool_new" c:identifier="g_thread_pool_new">
       <return-value>
-        <type name="GThreadPool" c:type="GThreadPool*"/>
+        <type name="ThreadPool" c:type="GThreadPool*"/>
       </return-value>
       <parameters>
         <parameter name="func">
-          <type name="GFunc" c:type="GFunc"/>
+          <type name="Func" c:type="GFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="max_threads">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="exclusive">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16867,13 +16804,13 @@
       </return-value>
       <parameters>
         <parameter name="pool">
-          <type name="GThreadPool" c:type="GThreadPool*"/>
+          <type name="ThreadPool" c:type="GThreadPool*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -16884,46 +16821,46 @@
       </return-value>
       <parameters>
         <parameter name="pool">
-          <type name="GThreadPool" c:type="GThreadPool*"/>
+          <type name="ThreadPool" c:type="GThreadPool*"/>
         </parameter>
         <parameter name="max_threads">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="thread_pool_get_max_threads"
               c:identifier="g_thread_pool_get_max_threads">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="pool">
-          <type name="GThreadPool" c:type="GThreadPool*"/>
+          <type name="ThreadPool" c:type="GThreadPool*"/>
         </parameter>
       </parameters>
     </function>
     <function name="thread_pool_get_num_threads"
               c:identifier="g_thread_pool_get_num_threads">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="pool">
-          <type name="GThreadPool" c:type="GThreadPool*"/>
+          <type name="ThreadPool" c:type="GThreadPool*"/>
         </parameter>
       </parameters>
     </function>
     <function name="thread_pool_unprocessed"
               c:identifier="g_thread_pool_unprocessed">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="pool">
-          <type name="GThreadPool" c:type="GThreadPool*"/>
+          <type name="ThreadPool" c:type="GThreadPool*"/>
         </parameter>
       </parameters>
     </function>
@@ -16933,7 +16870,7 @@
       </return-value>
       <parameters>
         <parameter name="pool">
-          <type name="GThreadPool" c:type="GThreadPool*"/>
+          <type name="ThreadPool" c:type="GThreadPool*"/>
         </parameter>
         <parameter name="immediate">
           <type name="boolean" c:type="gboolean"/>
@@ -16950,20 +16887,20 @@
       </return-value>
       <parameters>
         <parameter name="max_threads">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="thread_pool_get_max_unused_threads"
               c:identifier="g_thread_pool_get_max_unused_threads">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
     </function>
     <function name="thread_pool_get_num_unused_threads"
               c:identifier="g_thread_pool_get_num_unused_threads">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
     </function>
     <function name="thread_pool_stop_unused_threads"
@@ -16979,10 +16916,10 @@
       </return-value>
       <parameters>
         <parameter name="pool">
-          <type name="GThreadPool" c:type="GThreadPool*"/>
+          <type name="ThreadPool" c:type="GThreadPool*"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -16996,20 +16933,20 @@
       </return-value>
       <parameters>
         <parameter name="interval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="thread_pool_get_max_idle_time"
               c:identifier="g_thread_pool_get_max_idle_time">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
     </function>
     <record name="Timer" c:type="GTimer"/>
     <function name="timer_new" c:identifier="g_timer_new">
       <return-value>
-        <type name="GTimer" c:type="GTimer*"/>
+        <type name="Timer" c:type="GTimer*"/>
       </return-value>
     </function>
     <function name="timer_destroy" c:identifier="g_timer_destroy">
@@ -17018,7 +16955,7 @@
       </return-value>
       <parameters>
         <parameter name="timer">
-          <type name="GTimer" c:type="GTimer*"/>
+          <type name="Timer" c:type="GTimer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17028,7 +16965,7 @@
       </return-value>
       <parameters>
         <parameter name="timer">
-          <type name="GTimer" c:type="GTimer*"/>
+          <type name="Timer" c:type="GTimer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17038,7 +16975,7 @@
       </return-value>
       <parameters>
         <parameter name="timer">
-          <type name="GTimer" c:type="GTimer*"/>
+          <type name="Timer" c:type="GTimer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17048,7 +16985,7 @@
       </return-value>
       <parameters>
         <parameter name="timer">
-          <type name="GTimer" c:type="GTimer*"/>
+          <type name="Timer" c:type="GTimer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17058,7 +16995,7 @@
       </return-value>
       <parameters>
         <parameter name="timer">
-          <type name="GTimer" c:type="GTimer*"/>
+          <type name="Timer" c:type="GTimer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17068,10 +17005,10 @@
       </return-value>
       <parameters>
         <parameter name="timer">
-          <type name="GTimer" c:type="GTimer*"/>
+          <type name="Timer" c:type="GTimer*"/>
         </parameter>
         <parameter name="microseconds">
-          <type name="gulong" c:type="gulong*"/>
+          <type name="ulong" c:type="gulong*"/>
         </parameter>
       </parameters>
     </function>
@@ -17091,7 +17028,7 @@
       </return-value>
       <parameters>
         <parameter name="time_">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
         <parameter name="microseconds">
           <type name="long" c:type="glong"/>
@@ -17108,7 +17045,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="time_">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
       </parameters>
     </function>
@@ -17118,12 +17055,12 @@
       </return-value>
       <parameters>
         <parameter name="time_">
-          <type name="GTimeVal" c:type="GTimeVal*"/>
+          <type name="TimeVal" c:type="GTimeVal*"/>
         </parameter>
       </parameters>
     </function>
     <record name="Tree" c:type="GTree"/>
-    <callback name="GTraverseFunc">
+    <callback name="TraverseFunc" c:type="GTraverseFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -17141,21 +17078,21 @@
     </callback>
     <function name="tree_new" c:identifier="g_tree_new">
       <return-value>
-        <type name="GTree" c:type="GTree*"/>
+        <type name="Tree" c:type="GTree*"/>
       </return-value>
       <parameters>
         <parameter name="key_compare_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="tree_new_with_data" c:identifier="g_tree_new_with_data">
       <return-value>
-        <type name="GTree" c:type="GTree*"/>
+        <type name="Tree" c:type="GTree*"/>
       </return-value>
       <parameters>
         <parameter name="key_compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="key_compare_data">
           <type name="any" c:type="gpointer"/>
@@ -17164,20 +17101,20 @@
     </function>
     <function name="tree_new_full" c:identifier="g_tree_new_full">
       <return-value>
-        <type name="GTree" c:type="GTree*"/>
+        <type name="Tree" c:type="GTree*"/>
       </return-value>
       <parameters>
         <parameter name="key_compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="key_compare_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="key_destroy_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
         <parameter name="value_destroy_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -17187,7 +17124,7 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
       </parameters>
     </function>
@@ -17197,7 +17134,7 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gpointer"/>
@@ -17213,7 +17150,7 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gpointer"/>
@@ -17229,7 +17166,7 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
@@ -17242,7 +17179,7 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
@@ -17255,7 +17192,7 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="key">
           <type name="any" c:type="gconstpointer"/>
@@ -17269,16 +17206,16 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="lookup_key">
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="orig_key">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
         <parameter name="value">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="pointer" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17288,10 +17225,10 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="func">
-          <type name="GTraverseFunc" c:type="GTraverseFunc"/>
+          <type name="TraverseFunc" c:type="GTraverseFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -17304,13 +17241,13 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="traverse_func">
-          <type name="GTraverseFunc" c:type="GTraverseFunc"/>
+          <type name="TraverseFunc" c:type="GTraverseFunc"/>
         </parameter>
         <parameter name="traverse_type">
-          <type name="GTraverseType" c:type="GTraverseType"/>
+          <type name="TraverseType" c:type="GTraverseType"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -17323,10 +17260,10 @@
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
         <parameter name="search_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="CompareFunc" c:type="GCompareFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gconstpointer"/>
@@ -17335,21 +17272,21 @@
     </function>
     <function name="tree_height" c:identifier="g_tree_height">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
       </parameters>
     </function>
     <function name="tree_nnodes" c:identifier="g_tree_nnodes">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="tree">
-          <type name="GTree" c:type="GTree*"/>
+          <type name="Tree" c:type="GTree*"/>
         </parameter>
       </parameters>
     </function>
@@ -17479,7 +17416,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="test_func">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
       </parameters>
     </function>
@@ -17495,7 +17432,7 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="test_func">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
       </parameters>
     </function>
@@ -17560,21 +17497,21 @@
       </return-value>
       <parameters>
         <parameter name="destroy_func">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
         <parameter name="destroy_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GTestTrapFlags" c:type="GTestTrapFlags">
-      <member name="silence_stdout"
+    <enumeration name="TestTrapFlags" c:type="GTestTrapFlags">
+      <member name="silencestdout"
               value="128"
               c:identifier="G_TEST_TRAP_SILENCE_STDOUT"/>
-      <member name="silence_stderr"
+      <member name="silencestderr"
               value="256"
               c:identifier="G_TEST_TRAP_SILENCE_STDERR"/>
-      <member name="inherit_stdin"
+      <member name="inheritstdin"
               value="512"
               c:identifier="G_TEST_TRAP_INHERIT_STDIN"/>
     </enumeration>
@@ -17584,10 +17521,10 @@
       </return-value>
       <parameters>
         <parameter name="usec_timeout">
-          <type name="guint64" c:type="guint64"/>
+          <type name="uint64" c:type="guint64"/>
         </parameter>
         <parameter name="test_trap_flags">
-          <type name="GTestTrapFlags" c:type="GTestTrapFlags"/>
+          <type name="TestTrapFlags" c:type="GTestTrapFlags"/>
         </parameter>
       </parameters>
     </function>
@@ -17642,7 +17579,7 @@
     </function>
     <function name="test_create_case" c:identifier="g_test_create_case">
       <return-value>
-        <type name="GTestCase" c:type="GTestCase*"/>
+        <type name="TestCase" c:type="GTestCase*"/>
       </return-value>
       <parameters>
         <parameter name="test_name">
@@ -17655,19 +17592,19 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="data_setup">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
         <parameter name="data_test">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
         <parameter name="data_teardown">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
       </parameters>
     </function>
     <function name="test_create_suite" c:identifier="g_test_create_suite">
       <return-value>
-        <type name="GTestSuite" c:type="GTestSuite*"/>
+        <type name="TestSuite" c:type="GTestSuite*"/>
       </return-value>
       <parameters>
         <parameter name="suite_name">
@@ -17677,7 +17614,7 @@
     </function>
     <function name="test_get_root" c:identifier="g_test_get_root">
       <return-value>
-        <type name="GTestSuite" c:type="GTestSuite*"/>
+        <type name="TestSuite" c:type="GTestSuite*"/>
       </return-value>
     </function>
     <function name="test_suite_add" c:identifier="g_test_suite_add">
@@ -17686,10 +17623,10 @@
       </return-value>
       <parameters>
         <parameter name="suite">
-          <type name="GTestSuite" c:type="GTestSuite*"/>
+          <type name="TestSuite" c:type="GTestSuite*"/>
         </parameter>
         <parameter name="test_case">
-          <type name="GTestCase" c:type="GTestCase*"/>
+          <type name="TestCase" c:type="GTestCase*"/>
         </parameter>
       </parameters>
     </function>
@@ -17700,10 +17637,10 @@
       </return-value>
       <parameters>
         <parameter name="suite">
-          <type name="GTestSuite" c:type="GTestSuite*"/>
+          <type name="TestSuite" c:type="GTestSuite*"/>
         </parameter>
         <parameter name="nestedsuite">
-          <type name="GTestSuite" c:type="GTestSuite*"/>
+          <type name="TestSuite" c:type="GTestSuite*"/>
         </parameter>
       </parameters>
     </function>
@@ -17713,7 +17650,7 @@
       </return-value>
       <parameters>
         <parameter name="suite">
-          <type name="GTestSuite" c:type="GTestSuite*"/>
+          <type name="TestSuite" c:type="GTestSuite*"/>
         </parameter>
       </parameters>
     </function>
@@ -17736,7 +17673,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="assertion_flags">
-          <type name="guint64" c:type="guint64"/>
+          <type name="uint64" c:type="guint64"/>
         </parameter>
         <parameter name="pattern">
           <type name="string" c:type="char*"/>
@@ -17870,35 +17807,29 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="data_setup">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
         <parameter name="data_test">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
         <parameter name="data_teardown">
-          <type name="???" c:type="???*"/>
+          <type name="any" c:type="any*"/>
         </parameter>
       </parameters>
     </function>
     <record name="TestConfig" c:type="GTestConfig"/>
-    <enumeration name="GTestLogType" c:type="GTestLogType">
+    <enumeration name="TestLogType" c:type="GTestLogType">
       <member name="none" value="0" c:identifier="G_TEST_LOG_NONE"/>
       <member name="error" value="1" c:identifier="G_TEST_LOG_ERROR"/>
-      <member name="start_binary"
+      <member name="startbinary"
               value="2"
               c:identifier="G_TEST_LOG_START_BINARY"/>
-      <member name="list_case" value="3" c:identifier="G_TEST_LOG_LIST_CASE"/>
-      <member name="skip_case" value="4" c:identifier="G_TEST_LOG_SKIP_CASE"/>
-      <member name="start_case"
-              value="5"
-              c:identifier="G_TEST_LOG_START_CASE"/>
-      <member name="stop_case" value="6" c:identifier="G_TEST_LOG_STOP_CASE"/>
-      <member name="min_result"
-              value="7"
-              c:identifier="G_TEST_LOG_MIN_RESULT"/>
-      <member name="max_result"
-              value="8"
-              c:identifier="G_TEST_LOG_MAX_RESULT"/>
+      <member name="listcase" value="3" c:identifier="G_TEST_LOG_LIST_CASE"/>
+      <member name="skipcase" value="4" c:identifier="G_TEST_LOG_SKIP_CASE"/>
+      <member name="startcase" value="5" c:identifier="G_TEST_LOG_START_CASE"/>
+      <member name="stopcase" value="6" c:identifier="G_TEST_LOG_STOP_CASE"/>
+      <member name="minresult" value="7" c:identifier="G_TEST_LOG_MIN_RESULT"/>
+      <member name="maxresult" value="8" c:identifier="G_TEST_LOG_MAX_RESULT"/>
       <member name="message" value="9" c:identifier="G_TEST_LOG_MESSAGE"/>
     </enumeration>
     <record name="TestLogMsg" c:type="GTestLogMsg"/>
@@ -17909,13 +17840,13 @@
       </return-value>
       <parameters>
         <parameter name="log_type">
-          <type name="GTestLogType" c:type="GTestLogType"/>
+          <type name="TestLogType" c:type="GTestLogType"/>
         </parameter>
       </parameters>
     </function>
     <function name="test_log_buffer_new" c:identifier="g_test_log_buffer_new">
       <return-value>
-        <type name="GTestLogBuffer" c:type="GTestLogBuffer*"/>
+        <type name="TestLogBuffer" c:type="GTestLogBuffer*"/>
       </return-value>
     </function>
     <function name="test_log_buffer_free"
@@ -17925,7 +17856,7 @@
       </return-value>
       <parameters>
         <parameter name="tbuffer">
-          <type name="GTestLogBuffer" c:type="GTestLogBuffer*"/>
+          <type name="TestLogBuffer" c:type="GTestLogBuffer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17936,23 +17867,23 @@
       </return-value>
       <parameters>
         <parameter name="tbuffer">
-          <type name="GTestLogBuffer" c:type="GTestLogBuffer*"/>
+          <type name="TestLogBuffer" c:type="GTestLogBuffer*"/>
         </parameter>
         <parameter name="n_bytes">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="bytes">
-          <type name="guint8" c:type="guint8*"/>
+          <type name="uint8" c:type="guint8*"/>
         </parameter>
       </parameters>
     </function>
     <function name="test_log_buffer_pop" c:identifier="g_test_log_buffer_pop">
       <return-value>
-        <type name="GTestLogMsg" c:type="GTestLogMsg*"/>
+        <type name="TestLogMsg" c:type="GTestLogMsg*"/>
       </return-value>
       <parameters>
         <parameter name="tbuffer">
-          <type name="GTestLogBuffer" c:type="GTestLogBuffer*"/>
+          <type name="TestLogBuffer" c:type="GTestLogBuffer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17962,7 +17893,7 @@
       </return-value>
       <parameters>
         <parameter name="tmsg">
-          <type name="GTestLogMsg" c:type="GTestLogMsg*"/>
+          <type name="TestLogMsg" c:type="GTestLogMsg*"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/gobject-2.0-good.gir
==============================================================================
--- trunk/gir/gobject-2.0-good.gir	(original)
+++ trunk/gir/gobject-2.0-good.gir	Mon Aug 18 20:43:48 2008
@@ -3,5518 +3,5477 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="GObject">
-    <alias name="GType" target="gsize"/>
-    <alias name="GTypeCValue" target="_GTypeCValue"/>
-    <alias name="GSignalCMarshaller" target="GClosureMarshal"/>
-    <record name="Value" c:type="GValue"/>
-    <record name="TypePlugin" c:type="GTypePlugin"/>
-    <record name="TypeInstance" c:type="GTypeInstance"/>
-    <record name="TypeInfo" c:type="GTypeInfo"/>
-    <record name="TypeFundamentalInfo" c:type="GTypeFundamentalInfo"/>
-    <record name="InterfaceInfo" c:type="GInterfaceInfo"/>
-    <record name="TypeValueTable" c:type="GTypeValueTable"/>
-    <record name="TypeQuery" c:type="GTypeQuery"/>
-    <record name="GTypeInstance" c:type="_GTypeInstance">
-      <field name="g_class">
-        <type name="GTypeClass" c:type="GTypeClass*"/>
-      </field>
-    </record>
-    <record name="GTypeQuery" c:type="_GTypeQuery">
-      <field name="type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <field name="type_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="class_size">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="instance_size">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <enumeration name="GTypeDebugFlags" c:type="GTypeDebugFlags">
-      <member name="none" value="0" c:identifier="G_TYPE_DEBUG_NONE"/>
-      <member name="objects" value="1" c:identifier="G_TYPE_DEBUG_OBJECTS"/>
-      <member name="signals" value="2" c:identifier="G_TYPE_DEBUG_SIGNALS"/>
-      <member name="mask" value="3" c:identifier="G_TYPE_DEBUG_MASK"/>
-    </enumeration>
-    <function name="type_init" c:identifier="g_type_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="type_init_with_debug_flags"
-              c:identifier="g_type_init_with_debug_flags">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="debug_flags">
-          <type name="GTypeDebugFlags" c:type="GTypeDebugFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_name" c:identifier="g_type_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_qname" c:identifier="g_type_qname">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_from_name" c:identifier="g_type_from_name">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_parent" c:identifier="g_type_parent">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_depth" c:identifier="g_type_depth">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_next_base" c:identifier="g_type_next_base">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="leaf_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="root_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_is_a" c:identifier="g_type_is_a">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="is_a_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_class_ref" c:identifier="g_type_class_ref">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_class_peek" c:identifier="g_type_class_peek">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_class_peek_static"
-              c:identifier="g_type_class_peek_static">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_class_unref" c:identifier="g_type_class_unref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_class_peek_parent"
-              c:identifier="g_type_class_peek_parent">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_interface_peek" c:identifier="g_type_interface_peek">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="iface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_interface_peek_parent"
-              c:identifier="g_type_interface_peek_parent">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_default_interface_ref"
-              c:identifier="g_type_default_interface_ref">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_default_interface_peek"
-              c:identifier="g_type_default_interface_peek">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_default_interface_unref"
-              c:identifier="g_type_default_interface_unref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_children" c:identifier="g_type_children">
-      <return-value>
-        <type name="GType" c:type="GType*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="n_children">
-          <type name="GLib.guint" c:type="guint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_interfaces" c:identifier="g_type_interfaces">
-      <return-value>
-        <type name="GType" c:type="GType*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="n_interfaces">
-          <type name="GLib.guint" c:type="guint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_set_qdata" c:identifier="g_type_set_qdata">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_get_qdata" c:identifier="g_type_get_qdata">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_query" c:identifier="g_type_query">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="query">
-          <type name="GTypeQuery" c:type="GTypeQuery*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GBaseInitFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GBaseFinalizeFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GClassInitFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="class_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GClassFinalizeFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="class_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GInstanceInitFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="GTypeInstance" c:type="GTypeInstance*"/>
-        </parameter>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GInterfaceInitFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="iface_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GInterfaceFinalizeFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="iface_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GTypeClassCacheFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="cache_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="g_class">
-          <type name="GTypeClass" c:type="GTypeClass*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GTypeInterfaceCheckFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="check_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <enumeration name="GTypeFundamentalFlags" c:type="GTypeFundamentalFlags">
-      <member name="lag_classed" value="1" c:identifier="G_TYPE_FLAG_CLASSED"/>
-      <member name="lag_instantiatable"
-              value="2"
-              c:identifier="G_TYPE_FLAG_INSTANTIATABLE"/>
-      <member name="lag_derivable"
-              value="4"
-              c:identifier="G_TYPE_FLAG_DERIVABLE"/>
-      <member name="lag_deep_derivable"
-              value="8"
-              c:identifier="G_TYPE_FLAG_DEEP_DERIVABLE"/>
-    </enumeration>
-    <enumeration name="GTypeFlags" c:type="GTypeFlags">
-      <member name="_abstract" value="16" c:identifier="G_TYPE_FLAG_ABSTRACT"/>
-      <member name="_value_abstract"
-              value="32"
-              c:identifier="G_TYPE_FLAG_VALUE_ABSTRACT"/>
-    </enumeration>
-    <record name="GTypeInfo" c:type="_GTypeInfo">
-      <field name="class_size">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="base_init">
-        <type name="GBaseInitFunc" c:type="GBaseInitFunc"/>
-      </field>
-      <field name="base_finalize">
-        <type name="GBaseFinalizeFunc" c:type="GBaseFinalizeFunc"/>
-      </field>
-      <field name="class_init">
-        <type name="GClassInitFunc" c:type="GClassInitFunc"/>
-      </field>
-      <field name="class_finalize">
-        <type name="GClassFinalizeFunc" c:type="GClassFinalizeFunc"/>
-      </field>
-      <field name="class_data">
-        <type name="any" c:type="gconstpointer"/>
-      </field>
-      <field name="instance_size">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="n_preallocs">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="instance_init">
-        <type name="GInstanceInitFunc" c:type="GInstanceInitFunc"/>
-      </field>
-      <field name="value_table">
-        <type name="GTypeValueTable" c:type="GTypeValueTable*"/>
-      </field>
-    </record>
-    <record name="GTypeFundamentalInfo" c:type="_GTypeFundamentalInfo">
-      <field name="type_flags">
-        <type name="GTypeFundamentalFlags" c:type="GTypeFundamentalFlags"/>
-      </field>
-    </record>
-    <record name="GInterfaceInfo" c:type="_GInterfaceInfo">
-      <field name="interface_init">
-        <type name="GInterfaceInitFunc" c:type="GInterfaceInitFunc"/>
-      </field>
-      <field name="interface_finalize">
-        <type name="GInterfaceFinalizeFunc" c:type="GInterfaceFinalizeFunc"/>
-      </field>
-      <field name="interface_data">
-        <type name="any" c:type="gpointer"/>
-      </field>
-    </record>
-    <record name="GTypeValueTable" c:type="_GTypeValueTable">
-      <callback name="value_init">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="value_free">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="value_copy">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="src_value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="dest_value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="value_peek_pointer">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="collect_format">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <callback name="collect_value">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="n_collect_values">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="collect_values">
-            <type name="GTypeCValue" c:type="GTypeCValue*"/>
-          </parameter>
-          <parameter name="collect_flags">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="lcopy_format">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <callback name="lcopy_value">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="n_collect_values">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="collect_values">
-            <type name="GTypeCValue" c:type="GTypeCValue*"/>
-          </parameter>
-          <parameter name="collect_flags">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <function name="type_register_static"
-              c:identifier="g_type_register_static">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="type_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GTypeInfo" c:type="GTypeInfo*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GTypeFlags" c:type="GTypeFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_register_static_simple"
-              c:identifier="g_type_register_static_simple">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="type_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="class_size">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="class_init">
-          <type name="GClassInitFunc" c:type="GClassInitFunc"/>
-        </parameter>
-        <parameter name="instance_size">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="instance_init">
-          <type name="GInstanceInitFunc" c:type="GInstanceInitFunc"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GTypeFlags" c:type="GTypeFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_register_dynamic"
-              c:identifier="g_type_register_dynamic">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="type_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GTypeFlags" c:type="GTypeFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_register_fundamental"
-              c:identifier="g_type_register_fundamental">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="type_id">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="type_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GTypeInfo" c:type="GTypeInfo*"/>
-        </parameter>
-        <parameter name="finfo">
-          <type name="GTypeFundamentalInfo" c:type="GTypeFundamentalInfo*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GTypeFlags" c:type="GTypeFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_add_interface_static"
-              c:identifier="g_type_add_interface_static">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GInterfaceInfo" c:type="GInterfaceInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_add_interface_dynamic"
-              c:identifier="g_type_add_interface_dynamic">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_interface_add_prerequisite"
-              c:identifier="g_type_interface_add_prerequisite">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="prerequisite_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_interface_prerequisites"
-              c:identifier="g_type_interface_prerequisites">
-      <return-value>
-        <type name="GType" c:type="GType*"/>
-      </return-value>
-      <parameters>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="n_prerequisites">
-          <type name="GLib.guint" c:type="guint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_class_add_private"
-              c:identifier="g_type_class_add_private">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="private_size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_instance_get_private"
-              c:identifier="g_type_instance_get_private">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="GTypeInstance" c:type="GTypeInstance*"/>
-        </parameter>
-        <parameter name="private_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_get_plugin" c:identifier="g_type_get_plugin">
-      <return-value>
-        <type name="GTypePlugin" c:type="GTypePlugin*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_interface_get_plugin"
-              c:identifier="g_type_interface_get_plugin">
-      <return-value>
-        <type name="GTypePlugin" c:type="GTypePlugin*"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_fundamental_next"
-              c:identifier="g_type_fundamental_next">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-    </function>
-    <function name="type_fundamental" c:identifier="g_type_fundamental">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="type_id">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_create_instance"
-              c:identifier="g_type_create_instance">
-      <return-value>
-        <type name="GTypeInstance" c:type="GTypeInstance*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_free_instance" c:identifier="g_type_free_instance">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="GTypeInstance" c:type="GTypeInstance*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_add_class_cache_func"
-              c:identifier="g_type_add_class_cache_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cache_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="cache_func">
-          <type name="GTypeClassCacheFunc" c:type="GTypeClassCacheFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_remove_class_cache_func"
-              c:identifier="g_type_remove_class_cache_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cache_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="cache_func">
-          <type name="GTypeClassCacheFunc" c:type="GTypeClassCacheFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_class_unref_uncached"
-              c:identifier="g_type_class_unref_uncached">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_add_interface_check"
-              c:identifier="g_type_add_interface_check">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="check_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="check_func">
-          <type name="GTypeInterfaceCheckFunc"
-                c:type="GTypeInterfaceCheckFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_remove_interface_check"
-              c:identifier="g_type_remove_interface_check">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="check_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="check_func">
-          <type name="GTypeInterfaceCheckFunc"
-                c:type="GTypeInterfaceCheckFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_value_table_peek"
-              c:identifier="g_type_value_table_peek">
-      <return-value>
-        <type name="GTypeValueTable" c:type="GTypeValueTable*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_instance" c:identifier="g_type_check_instance">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="GTypeInstance" c:type="GTypeInstance*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_instance_cast"
-              c:identifier="g_type_check_instance_cast">
-      <return-value>
-        <type name="GTypeInstance" c:type="GTypeInstance*"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="GTypeInstance" c:type="GTypeInstance*"/>
-        </parameter>
-        <parameter name="iface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_instance_is_a"
-              c:identifier="g_type_check_instance_is_a">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="GTypeInstance" c:type="GTypeInstance*"/>
-        </parameter>
-        <parameter name="iface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_class_cast"
-              c:identifier="g_type_check_class_cast">
-      <return-value>
-        <type name="GTypeClass" c:type="GTypeClass*"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="GTypeClass" c:type="GTypeClass*"/>
-        </parameter>
-        <parameter name="is_a_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_class_is_a"
-              c:identifier="g_type_check_class_is_a">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="GTypeClass" c:type="GTypeClass*"/>
-        </parameter>
-        <parameter name="is_a_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_is_value_type"
-              c:identifier="g_type_check_is_value_type">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_value" c:identifier="g_type_check_value">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_check_value_holds"
-              c:identifier="g_type_check_value_holds">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_test_flags" c:identifier="g_type_test_flags">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_name_from_instance"
-              c:identifier="g_type_name_from_instance">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="GTypeInstance" c:type="GTypeInstance*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_name_from_class"
-              c:identifier="g_type_name_from_class">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_class">
-          <type name="GTypeClass" c:type="GTypeClass*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_c_init" c:identifier="g_value_c_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="value_types_init" c:identifier="g_value_types_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="enum_types_init" c:identifier="g_enum_types_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="param_type_init" c:identifier="g_param_type_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="boxed_type_init" c:identifier="g_boxed_type_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="object_type_init" c:identifier="g_object_type_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="param_spec_types_init"
-              c:identifier="g_param_spec_types_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="value_transforms_init"
-              c:identifier="g_value_transforms_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="signal_init" c:identifier="g_signal_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <callback name="GBoxedCopyFunc">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="boxed">
+    <alias name="Type" target="size" c:type="GType"/>
+    <alias name="TypeCValue" target="TypeCValue" c:type="GTypeCValue"/>
+    <alias name="SignalCMarshaller"
+           target="ClosureMarshal"
+           c:type="GSignalCMarshaller"/>
+    <glib:boxed c:type="Value"
+                glib:name="Value"
+                glib:type-name="GValue"
+                glib:get-type="g_value_get_type">
+      <constructor name="init" c:identifier="g_value_init">
+        <return-value>
+          <type name="Value" c:type="GValue*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="g_type">
+            <type name="Type" c:type="GType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="reset" c:identifier="g_value_reset">
+        <return-value>
+          <type name="Value" c:type="GValue*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="array_get_nth" c:identifier="g_value_array_get_nth">
+        <return-value>
+          <type name="Value" c:type="GValue*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_enum" c:identifier="g_value_set_enum">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_enum">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_enum" c:identifier="g_value_get_enum">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_flags" c:identifier="g_value_set_flags">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_flags">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_flags" c:identifier="g_value_get_flags">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="copy" c:identifier="g_value_copy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="src_value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="dest_value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unset" c:identifier="g_value_unset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_instance" c:identifier="g_value_set_instance">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="instance">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="fits_pointer" c:identifier="g_value_fits_pointer">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="peek_pointer" c:identifier="g_value_peek_pointer">
+        <return-value>
           <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GBoxedFreeFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="boxed">
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="transform" c:identifier="g_value_transform">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="src_value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="dest_value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_param" c:identifier="g_value_set_param">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="param">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_param" c:identifier="g_value_get_param">
+        <return-value>
+          <type name="ParamSpec" c:type="GParamSpec*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="dup_param" c:identifier="g_value_dup_param">
+        <return-value>
+          <type name="ParamSpec" c:type="GParamSpec*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="take_param" c:identifier="g_value_take_param">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="param">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_param_take_ownership"
+              c:identifier="g_value_set_param_take_ownership">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="param">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_object" c:identifier="g_value_set_object">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_object">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_object" c:identifier="g_value_get_object">
+        <return-value>
           <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="boxed_copy" c:identifier="g_boxed_copy">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="boxed_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="src_boxed">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="boxed_free" c:identifier="g_boxed_free">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="boxed_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="boxed">
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="dup_object" c:identifier="g_value_dup_object">
+        <return-value>
           <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_boxed" c:identifier="g_value_set_boxed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_boxed">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_static_boxed"
-              c:identifier="g_value_set_static_boxed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_boxed">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_get_boxed" c:identifier="g_value_get_boxed">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_dup_boxed" c:identifier="g_value_dup_boxed">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="boxed_type_register_static"
-              c:identifier="g_boxed_type_register_static">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="take_object" c:identifier="g_value_take_object">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_object">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_object_take_ownership"
+              c:identifier="g_value_set_object_take_ownership">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_object">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_char" c:identifier="g_value_set_char">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_char">
+            <type name="char" c:type="gchar"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_char" c:identifier="g_value_get_char">
+        <return-value>
+          <type name="char" c:type="gchar"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_uchar" c:identifier="g_value_set_uchar">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_uchar">
+            <type name="uchar" c:type="guchar"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_uchar" c:identifier="g_value_get_uchar">
+        <return-value>
+          <type name="uchar" c:type="guchar"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_boolean" c:identifier="g_value_set_boolean">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_boolean">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_boolean" c:identifier="g_value_get_boolean">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_int" c:identifier="g_value_set_int">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_int">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_int" c:identifier="g_value_get_int">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_uint" c:identifier="g_value_set_uint">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_uint">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_uint" c:identifier="g_value_get_uint">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_long" c:identifier="g_value_set_long">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_long">
+            <type name="long" c:type="glong"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_long" c:identifier="g_value_get_long">
+        <return-value>
+          <type name="long" c:type="glong"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_ulong" c:identifier="g_value_set_ulong">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_ulong">
+            <type name="ulong" c:type="gulong"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_ulong" c:identifier="g_value_get_ulong">
+        <return-value>
+          <type name="ulong" c:type="gulong"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_int64" c:identifier="g_value_set_int64">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_int64">
+            <type name="int64" c:type="gint64"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_int64" c:identifier="g_value_get_int64">
+        <return-value>
+          <type name="int64" c:type="gint64"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_uint64" c:identifier="g_value_set_uint64">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_uint64">
+            <type name="uint64" c:type="guint64"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_uint64" c:identifier="g_value_get_uint64">
+        <return-value>
+          <type name="uint64" c:type="guint64"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_float" c:identifier="g_value_set_float">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_float">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_float" c:identifier="g_value_get_float">
+        <return-value>
+          <type name="float" c:type="gfloat"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_double" c:identifier="g_value_set_double">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_double">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_double" c:identifier="g_value_get_double">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_string" c:identifier="g_value_set_string">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_static_string"
+              c:identifier="g_value_set_static_string">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_string" c:identifier="g_value_get_string">
+        <return-value>
           <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="boxed_copy">
-          <type name="GBoxedCopyFunc" c:type="GBoxedCopyFunc"/>
-        </parameter>
-        <parameter name="boxed_free">
-          <type name="GBoxedFreeFunc" c:type="GBoxedFreeFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_take_boxed" c:identifier="g_value_take_boxed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_boxed">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_boxed_take_ownership"
-              c:identifier="g_value_set_boxed_take_ownership">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_boxed">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="Closure" c:type="GClosure"/>
-    <record name="ClosureNotifyData" c:type="GClosureNotifyData"/>
-    <callback name="GCallback">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </callback>
-    <callback name="GClosureNotify">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GClosureMarshal">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="dup_string" c:identifier="g_value_dup_string">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pointer" c:identifier="g_value_set_pointer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_pointer">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pointer" c:identifier="g_value_get_pointer">
+        <return-value>
           <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="CClosure" c:type="GCClosure"/>
-    <record name="GClosureNotifyData" c:type="_GClosureNotifyData">
-      <field name="data">
-        <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_gtype" c:identifier="g_value_set_gtype">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_gtype">
+            <type name="Type" c:type="GType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_gtype" c:identifier="g_value_get_gtype">
+        <return-value>
+          <type name="Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="take_string" c:identifier="g_value_take_string">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_string_take_ownership"
+              c:identifier="g_value_set_string_take_ownership">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="v_string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <interface name="TypePlugin"
+               c:type="GTypePlugin"
+               glib:type-name="GTypePlugin"
+               glib:get-type="g_type_plugin_get_type">
+      <field name="use_plugin">
+        <type name="TypePluginUse" c:type="GTypePluginUse"/>
+      </field>
+      <field name="unuse_plugin">
+        <type name="TypePluginUnuse" c:type="GTypePluginUnuse"/>
+      </field>
+      <field name="complete_type_info">
+        <type name="TypePluginCompleteTypeInfo"
+              c:type="GTypePluginCompleteTypeInfo"/>
+      </field>
+      <field name="complete_interface_info">
+        <type name="TypePluginCompleteInterfaceInfo"
+              c:type="GTypePluginCompleteInterfaceInfo"/>
+      </field>
+    </interface>
+    <record name="TypeClass" c:type="GTypeClass">
+      <field name="g_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+    </record>
+    <record name="TypeInterface" c:type="GTypeInterface">
+      <field name="g_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+      <field name="g_instance_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+    </record>
+    <record name="TypeInstance" c:type="GTypeInstance">
+      <field name="g_class">
+        <type name="TypeClass" c:type="GTypeClass*"/>
+      </field>
+    </record>
+    <record name="TypeInfo" c:type="GTypeInfo">
+      <field name="class_size">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="base_init">
+        <type name="BaseInitFunc" c:type="GBaseInitFunc"/>
+      </field>
+      <field name="base_finalize">
+        <type name="BaseFinalizeFunc" c:type="GBaseFinalizeFunc"/>
       </field>
-      <field name="notify">
-        <type name="GClosureNotify" c:type="GClosureNotify"/>
+      <field name="class_init">
+        <type name="ClassInitFunc" c:type="GClassInitFunc"/>
       </field>
-    </record>
-    <record name="GClosure" c:type="_GClosure">
-      <field name="ref_count">
-        <type name="uint32" c:type="guint"/>
+      <field name="class_finalize">
+        <type name="ClassFinalizeFunc" c:type="GClassFinalizeFunc"/>
       </field>
-      <field name="meta_marshal">
-        <type name="uint32" c:type="guint"/>
+      <field name="class_data">
+        <type name="any" c:type="gconstpointer"/>
       </field>
-      <field name="n_guards">
-        <type name="uint32" c:type="guint"/>
+      <field name="instance_size">
+        <type name="uint16" c:type="guint16"/>
       </field>
-      <field name="n_fnotifiers">
-        <type name="uint32" c:type="guint"/>
+      <field name="n_preallocs">
+        <type name="uint16" c:type="guint16"/>
       </field>
-      <field name="n_inotifiers">
-        <type name="uint32" c:type="guint"/>
+      <field name="instance_init">
+        <type name="InstanceInitFunc" c:type="GInstanceInitFunc"/>
       </field>
-      <field name="in_inotify">
-        <type name="uint32" c:type="guint"/>
+      <field name="value_table">
+        <type name="TypeValueTable" c:type="GTypeValueTable*"/>
       </field>
-      <field name="floating">
-        <type name="uint32" c:type="guint"/>
+    </record>
+    <record name="TypeFundamentalInfo" c:type="GTypeFundamentalInfo">
+      <field name="type_flags">
+        <type name="TypeFundamentalFlags" c:type="GTypeFundamentalFlags"/>
       </field>
-      <field name="derivative_flag">
-        <type name="uint32" c:type="guint"/>
+    </record>
+    <record name="InterfaceInfo" c:type="GInterfaceInfo">
+      <field name="interface_init">
+        <type name="InterfaceInitFunc" c:type="GInterfaceInitFunc"/>
       </field>
-      <field name="in_marshal">
-        <type name="uint32" c:type="guint"/>
+      <field name="interface_finalize">
+        <type name="InterfaceFinalizeFunc" c:type="GInterfaceFinalizeFunc"/>
       </field>
-      <field name="is_invalid">
-        <type name="uint32" c:type="guint"/>
+      <field name="interface_data">
+        <type name="any" c:type="gpointer"/>
       </field>
-      <callback name="marshal">
+    </record>
+    <record name="TypeValueTable" c:type="GTypeValueTable">
+      <callback name="value_init" c:type="value_init">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="closure">
-            <type name="GClosure" c:type="GClosure*"/>
-          </parameter>
-          <parameter name="return_value">
-            <type name="GValue" c:type="GValue*"/>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
-          <parameter name="n_param_values">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </callback>
+      <callback name="value_free" c:type="value_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
-          <parameter name="param_values">
-            <type name="GValue" c:type="GValue*"/>
+        </parameters>
+      </callback>
+      <callback name="value_copy" c:type="value_copy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="src_value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
-          <parameter name="invocation_hint">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="dest_value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
-          <parameter name="marshal_data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </callback>
+      <callback name="value_peek_pointer" c:type="value_peek_pointer">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <field name="data">
-        <type name="any" c:type="gpointer"/>
+      <field name="collect_format">
+        <type name="string" c:type="gchar*"/>
       </field>
-      <field name="notifiers">
-        <type name="GClosureNotifyData" c:type="GClosureNotifyData*"/>
+      <callback name="collect_value" c:type="collect_value">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_collect_values">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="collect_values">
+            <type name="TypeCValue" c:type="GTypeCValue*"/>
+          </parameter>
+          <parameter name="collect_flags">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="lcopy_format">
+        <type name="string" c:type="gchar*"/>
       </field>
+      <callback name="lcopy_value" c:type="lcopy_value">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_collect_values">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="collect_values">
+            <type name="TypeCValue" c:type="GTypeCValue*"/>
+          </parameter>
+          <parameter name="collect_flags">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
     </record>
-    <record name="GCClosure" c:type="_GCClosure">
-      <field name="closure">
-        <type name="GClosure" c:type="GClosure"/>
+    <record name="TypeQuery" c:type="GTypeQuery">
+      <field name="type">
+        <type name="Type" c:type="GType"/>
       </field>
-      <field name="callback">
-        <type name="any" c:type="gpointer"/>
+      <field name="type_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="class_size">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="instance_size">
+        <type name="uint" c:type="guint"/>
       </field>
     </record>
-    <function name="cclosure_new" c:identifier="g_cclosure_new">
+    <enumeration name="TypeDebugFlags" c:type="GTypeDebugFlags">
+      <member name="none" value="0" c:identifier="G_TYPE_DEBUG_NONE"/>
+      <member name="objects" value="1" c:identifier="G_TYPE_DEBUG_OBJECTS"/>
+      <member name="signals" value="2" c:identifier="G_TYPE_DEBUG_SIGNALS"/>
+      <member name="mask" value="3" c:identifier="G_TYPE_DEBUG_MASK"/>
+    </enumeration>
+    <function name="type_init" c:identifier="g_type_init">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="callback_func">
-          <type name="GCallback" c:type="GCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy_data">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="cclosure_new_swap" c:identifier="g_cclosure_new_swap">
+    <function name="type_init_with_debug_flags"
+              c:identifier="g_type_init_with_debug_flags">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="callback_func">
-          <type name="GCallback" c:type="GCallback"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy_data">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
+        <parameter name="debug_flags">
+          <type name="TypeDebugFlags" c:type="GTypeDebugFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_type_cclosure_new"
-              c:identifier="g_signal_type_cclosure_new">
+    <function name="type_name" c:identifier="g_type_name">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="struct_offset">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_ref" c:identifier="g_closure_ref">
+    <function name="type_qname" c:identifier="g_type_qname">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="Quark" c:type="GQuark"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_sink" c:identifier="g_closure_sink">
+    <function name="type_from_name" c:identifier="g_type_from_name">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_unref" c:identifier="g_closure_unref">
+    <function name="type_parent" c:identifier="g_type_parent">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_new_simple" c:identifier="g_closure_new_simple">
+    <function name="type_depth" c:identifier="g_type_depth">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="sizeof_closure">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_add_finalize_notifier"
-              c:identifier="g_closure_add_finalize_notifier">
+    <function name="type_next_base" c:identifier="g_type_next_base">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="notify_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="leaf_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="notify_func">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
+        <parameter name="root_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_remove_finalize_notifier"
-              c:identifier="g_closure_remove_finalize_notifier">
+    <function name="type_is_a" c:identifier="g_type_is_a">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="notify_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="notify_func">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
+        <parameter name="is_a_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_add_invalidate_notifier"
-              c:identifier="g_closure_add_invalidate_notifier">
+    <function name="type_class_ref" c:identifier="g_type_class_ref">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="notify_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="notify_func">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_remove_invalidate_notifier"
-              c:identifier="g_closure_remove_invalidate_notifier">
+    <function name="type_class_peek" c:identifier="g_type_class_peek">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="notify_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="notify_func">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_add_marshal_guards"
-              c:identifier="g_closure_add_marshal_guards">
+    <function name="type_class_peek_static"
+              c:identifier="g_type_class_peek_static">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="pre_marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="pre_marshal_notify">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
-        </parameter>
-        <parameter name="post_marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="post_marshal_notify">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_set_marshal" c:identifier="g_closure_set_marshal">
+    <function name="type_class_unref" c:identifier="g_type_class_unref">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="marshal">
-          <type name="GClosureMarshal" c:type="GClosureMarshal"/>
+        <parameter name="g_class">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_set_meta_marshal"
-              c:identifier="g_closure_set_meta_marshal">
+    <function name="type_class_peek_parent"
+              c:identifier="g_type_class_peek_parent">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="marshal_data">
+        <parameter name="g_class">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="meta_marshal">
-          <type name="GClosureMarshal" c:type="GClosureMarshal"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="closure_invalidate" c:identifier="g_closure_invalidate">
+    <function name="type_interface_peek" c:identifier="g_type_interface_peek">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="instance_class">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="iface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_invoke" c:identifier="g_closure_invoke">
+    <function name="type_interface_peek_parent"
+              c:identifier="g_type_interface_peek_parent">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="g_iface">
           <type name="any" c:type="gpointer"/>
         </parameter>
-      </parameters>
-    </function>
-    <record name="EnumValue" c:type="GEnumValue"/>
-    <record name="FlagsValue" c:type="GFlagsValue"/>
-    <record name="GEnumValue" c:type="_GEnumValue">
-      <field name="value">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="value_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="value_nick">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <record name="GFlagsValue" c:type="_GFlagsValue">
-      <field name="value">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="value_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="value_nick">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <function name="enum_get_value" c:identifier="g_enum_get_value">
+      </parameters>
+    </function>
+    <function name="type_default_interface_ref"
+              c:identifier="g_type_default_interface_ref">
       <return-value>
-        <type name="GEnumValue" c:type="GEnumValue*"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="enum_class">
-          <type name="GEnumClass" c:type="GEnumClass*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="int32" c:type="gint"/>
+        <parameter name="g_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="enum_get_value_by_name"
-              c:identifier="g_enum_get_value_by_name">
+    <function name="type_default_interface_peek"
+              c:identifier="g_type_default_interface_peek">
       <return-value>
-        <type name="GEnumValue" c:type="GEnumValue*"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="enum_class">
-          <type name="GEnumClass" c:type="GEnumClass*"/>
+        <parameter name="g_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="type_default_interface_unref"
+              c:identifier="g_type_default_interface_unref">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="g_iface">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="enum_get_value_by_nick"
-              c:identifier="g_enum_get_value_by_nick">
+    <function name="type_children" c:identifier="g_type_children">
       <return-value>
-        <type name="GEnumValue" c:type="GEnumValue*"/>
+        <type name="Type" c:type="GType*"/>
       </return-value>
       <parameters>
-        <parameter name="enum_class">
-          <type name="GEnumClass" c:type="GEnumClass*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="n_children">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="flags_get_first_value"
-              c:identifier="g_flags_get_first_value">
+    <function name="type_interfaces" c:identifier="g_type_interfaces">
       <return-value>
-        <type name="GFlagsValue" c:type="GFlagsValue*"/>
+        <type name="Type" c:type="GType*"/>
       </return-value>
       <parameters>
-        <parameter name="flags_class">
-          <type name="GFlagsClass" c:type="GFlagsClass*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="value">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="n_interfaces">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="flags_get_value_by_name"
-              c:identifier="g_flags_get_value_by_name">
+    <function name="type_set_qdata" c:identifier="g_type_set_qdata">
       <return-value>
-        <type name="GFlagsValue" c:type="GFlagsValue*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="flags_class">
-          <type name="GFlagsClass" c:type="GFlagsClass*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="quark">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="flags_get_value_by_nick"
-              c:identifier="g_flags_get_value_by_nick">
+    <function name="type_get_qdata" c:identifier="g_type_get_qdata">
       <return-value>
-        <type name="GFlagsValue" c:type="GFlagsValue*"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="flags_class">
-          <type name="GFlagsClass" c:type="GFlagsClass*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="quark">
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_enum" c:identifier="g_value_set_enum">
+    <function name="type_query" c:identifier="g_type_query">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="v_enum">
-          <type name="int32" c:type="gint"/>
+        <parameter name="query">
+          <type name="TypeQuery" c:type="GTypeQuery*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_enum" c:identifier="g_value_get_enum">
+    <callback name="BaseInitFunc" c:type="GBaseInitFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="g_class">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="value_set_flags" c:identifier="g_value_set_flags">
+    </callback>
+    <callback name="BaseFinalizeFunc" c:type="GBaseFinalizeFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_flags">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="g_class">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="value_get_flags" c:identifier="g_value_get_flags">
+    </callback>
+    <callback name="ClassInitFunc" c:type="GClassInitFunc">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="g_class">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="class_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="enum_register_static"
-              c:identifier="g_enum_register_static">
+    </callback>
+    <callback name="ClassFinalizeFunc" c:type="GClassFinalizeFunc">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="g_class">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="const_static_values">
-          <type name="GEnumValue" c:type="GEnumValue*"/>
+        <parameter name="class_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="flags_register_static"
-              c:identifier="g_flags_register_static">
+    </callback>
+    <callback name="InstanceInitFunc" c:type="GInstanceInitFunc">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="instance">
+          <type name="TypeInstance" c:type="GTypeInstance*"/>
         </parameter>
-        <parameter name="const_static_values">
-          <type name="GFlagsValue" c:type="GFlagsValue*"/>
+        <parameter name="g_class">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="enum_complete_type_info"
-              c:identifier="g_enum_complete_type_info">
+    </callback>
+    <callback name="InterfaceInitFunc" c:type="GInterfaceInitFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="g_enum_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GTypeInfo" c:type="GTypeInfo*"/>
+        <parameter name="g_iface">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="const_values">
-          <type name="GEnumValue" c:type="GEnumValue*"/>
+        <parameter name="iface_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="flags_complete_type_info"
-              c:identifier="g_flags_complete_type_info">
+    </callback>
+    <callback name="InterfaceFinalizeFunc" c:type="GInterfaceFinalizeFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="g_flags_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="g_iface">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="info">
-          <type name="GTypeInfo" c:type="GTypeInfo*"/>
+        <parameter name="iface_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="const_values">
-          <type name="GFlagsValue" c:type="GFlagsValue*"/>
+      </parameters>
+    </callback>
+    <callback name="TypeClassCacheFunc" c:type="GTypeClassCacheFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="cache_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="g_class">
+          <type name="TypeClass" c:type="GTypeClass*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="cclosure_marshal_void__void"
-              c:identifier="g_cclosure_marshal_VOID__VOID">
+    </callback>
+    <callback name="TypeInterfaceCheckFunc" c:type="GTypeInterfaceCheckFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="check_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="g_iface">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+      </parameters>
+    </callback>
+    <enumeration name="TypeFundamentalFlags" c:type="GTypeFundamentalFlags">
+      <member name="lagclassed" value="1" c:identifier="G_TYPE_FLAG_CLASSED"/>
+      <member name="laginstantiatable"
+              value="2"
+              c:identifier="G_TYPE_FLAG_INSTANTIATABLE"/>
+      <member name="lagderivable"
+              value="4"
+              c:identifier="G_TYPE_FLAG_DERIVABLE"/>
+      <member name="lagdeepderivable"
+              value="8"
+              c:identifier="G_TYPE_FLAG_DEEP_DERIVABLE"/>
+    </enumeration>
+    <enumeration name="TypeFlags" c:type="GTypeFlags">
+      <member name="abstract" value="16" c:identifier="G_TYPE_FLAG_ABSTRACT"/>
+      <member name="valueabstract"
+              value="32"
+              c:identifier="G_TYPE_FLAG_VALUE_ABSTRACT"/>
+    </enumeration>
+    <function name="type_register_static"
+              c:identifier="g_type_register_static">
+      <return-value>
+        <type name="Type" c:type="GType"/>
+      </return-value>
+      <parameters>
+        <parameter name="parent_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="type_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="info">
+          <type name="TypeInfo" c:type="GTypeInfo*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="flags">
+          <type name="TypeFlags" c:type="GTypeFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__boolean"
-              c:identifier="g_cclosure_marshal_VOID__BOOLEAN">
+    <function name="type_register_static_simple"
+              c:identifier="g_type_register_static_simple">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="parent_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="type_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="class_size">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="class_init">
+          <type name="ClassInitFunc" c:type="GClassInitFunc"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="instance_size">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="instance_init">
+          <type name="InstanceInitFunc" c:type="GInstanceInitFunc"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="TypeFlags" c:type="GTypeFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__char"
-              c:identifier="g_cclosure_marshal_VOID__CHAR">
+    <function name="type_register_dynamic"
+              c:identifier="g_type_register_dynamic">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="parent_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="type_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="flags">
+          <type name="TypeFlags" c:type="GTypeFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__uchar"
-              c:identifier="g_cclosure_marshal_VOID__UCHAR">
+    <function name="type_register_fundamental"
+              c:identifier="g_type_register_fundamental">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="type_id">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="type_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="info">
+          <type name="TypeInfo" c:type="GTypeInfo*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="finfo">
+          <type name="TypeFundamentalInfo" c:type="GTypeFundamentalInfo*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="flags">
+          <type name="TypeFlags" c:type="GTypeFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__int"
-              c:identifier="g_cclosure_marshal_VOID__INT">
+    <function name="type_add_interface_static"
+              c:identifier="g_type_add_interface_static">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="instance_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="interface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="info">
+          <type name="InterfaceInfo" c:type="GInterfaceInfo*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__uint"
-              c:identifier="g_cclosure_marshal_VOID__UINT">
+    <function name="type_add_interface_dynamic"
+              c:identifier="g_type_add_interface_dynamic">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="instance_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="interface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__long"
-              c:identifier="g_cclosure_marshal_VOID__LONG">
+    <function name="type_interface_add_prerequisite"
+              c:identifier="g_type_interface_add_prerequisite">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="interface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="prerequisite_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="type_interface_prerequisites"
+              c:identifier="g_type_interface_prerequisites">
+      <return-value>
+        <type name="Type" c:type="GType*"/>
+      </return-value>
+      <parameters>
+        <parameter name="interface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="n_prerequisites">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__ulong"
-              c:identifier="g_cclosure_marshal_VOID__ULONG">
+    <function name="type_class_add_private"
+              c:identifier="g_type_class_add_private">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="g_class">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="private_size">
+          <type name="size" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__enum"
-              c:identifier="g_cclosure_marshal_VOID__ENUM">
+    <function name="type_instance_get_private"
+              c:identifier="g_type_instance_get_private">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="instance">
+          <type name="TypeInstance" c:type="GTypeInstance*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="private_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__flags"
-              c:identifier="g_cclosure_marshal_VOID__FLAGS">
+    <function name="type_get_plugin" c:identifier="g_type_get_plugin">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="TypePlugin" c:type="GTypePlugin*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+      </parameters>
+    </function>
+    <function name="type_interface_get_plugin"
+              c:identifier="g_type_interface_get_plugin">
+      <return-value>
+        <type name="TypePlugin" c:type="GTypePlugin*"/>
+      </return-value>
+      <parameters>
+        <parameter name="instance_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="interface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="type_fundamental_next"
+              c:identifier="g_type_fundamental_next">
+      <return-value>
+        <type name="Type" c:type="GType"/>
+      </return-value>
+    </function>
+    <function name="type_fundamental" c:identifier="g_type_fundamental">
+      <return-value>
+        <type name="Type" c:type="GType"/>
+      </return-value>
+      <parameters>
+        <parameter name="type_id">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="type_create_instance"
+              c:identifier="g_type_create_instance">
+      <return-value>
+        <type name="TypeInstance" c:type="GTypeInstance*"/>
+      </return-value>
+      <parameters>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__float"
-              c:identifier="g_cclosure_marshal_VOID__FLOAT">
+    <function name="type_free_instance" c:identifier="g_type_free_instance">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="instance">
+          <type name="TypeInstance" c:type="GTypeInstance*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__double"
-              c:identifier="g_cclosure_marshal_VOID__DOUBLE">
+    <function name="type_add_class_cache_func"
+              c:identifier="g_type_add_class_cache_func">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="cache_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="cache_func">
+          <type name="TypeClassCacheFunc" c:type="GTypeClassCacheFunc"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__string"
-              c:identifier="g_cclosure_marshal_VOID__STRING">
+    <function name="type_remove_class_cache_func"
+              c:identifier="g_type_remove_class_cache_func">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="cache_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="cache_func">
+          <type name="TypeClassCacheFunc" c:type="GTypeClassCacheFunc"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__param"
-              c:identifier="g_cclosure_marshal_VOID__PARAM">
+    <function name="type_class_unref_uncached"
+              c:identifier="g_type_class_unref_uncached">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
+        <parameter name="g_class">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__boxed"
-              c:identifier="g_cclosure_marshal_VOID__BOXED">
+    <function name="type_add_interface_check"
+              c:identifier="g_type_add_interface_check">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="check_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="check_func">
+          <type name="TypeInterfaceCheckFunc"
+                c:type="GTypeInterfaceCheckFunc"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__pointer"
-              c:identifier="g_cclosure_marshal_VOID__POINTER">
+    <function name="type_remove_interface_check"
+              c:identifier="g_type_remove_interface_check">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="check_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="check_func">
+          <type name="TypeInterfaceCheckFunc"
+                c:type="GTypeInterfaceCheckFunc"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__object"
-              c:identifier="g_cclosure_marshal_VOID__OBJECT">
+    <function name="type_value_table_peek"
+              c:identifier="g_type_value_table_peek">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="TypeValueTable" c:type="GTypeValueTable*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+      </parameters>
+    </function>
+    <function name="type_check_instance" c:identifier="g_type_check_instance">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="instance">
+          <type name="TypeInstance" c:type="GTypeInstance*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+      </parameters>
+    </function>
+    <function name="type_check_instance_cast"
+              c:identifier="g_type_check_instance_cast">
+      <return-value>
+        <type name="TypeInstance" c:type="GTypeInstance*"/>
+      </return-value>
+      <parameters>
+        <parameter name="instance">
+          <type name="TypeInstance" c:type="GTypeInstance*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="iface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="type_check_instance_is_a"
+              c:identifier="g_type_check_instance_is_a">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="instance">
+          <type name="TypeInstance" c:type="GTypeInstance*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="iface_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_void__uint_pointer"
-              c:identifier="g_cclosure_marshal_VOID__UINT_POINTER">
+    <function name="type_check_class_cast"
+              c:identifier="g_type_check_class_cast">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="TypeClass" c:type="GTypeClass*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="g_class">
+          <type name="TypeClass" c:type="GTypeClass*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="is_a_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_boolean__flags"
-              c:identifier="g_cclosure_marshal_BOOLEAN__FLAGS">
+    <function name="type_check_class_is_a"
+              c:identifier="g_type_check_class_is_a">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="g_class">
+          <type name="TypeClass" c:type="GTypeClass*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="is_a_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_marshal_string__object_pointer"
-              c:identifier="g_cclosure_marshal_STRING__OBJECT_POINTER">
+    <function name="type_check_is_value_type"
+              c:identifier="g_type_check_is_value_type">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GValueTransform">
+    <function name="type_check_value" c:identifier="g_type_check_value">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="src_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="dest_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
-    </callback>
-    <record name="GValue" c:type="_GValue">
-      <field name="g_type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <field name="data">
-        <type name="???" c:type="???"/>
-      </field>
-    </record>
-    <function name="value_init" c:identifier="g_value_init">
+    </function>
+    <function name="type_check_value_holds"
+              c:identifier="g_type_check_value_holds">
       <return-value>
-        <type name="GValue" c:type="GValue*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="g_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_copy" c:identifier="g_value_copy">
+    <function name="type_test_flags" c:identifier="g_type_test_flags">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="src_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="dest_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="flags">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_reset" c:identifier="g_value_reset">
+    <function name="type_name_from_instance"
+              c:identifier="g_type_name_from_instance">
       <return-value>
-        <type name="GValue" c:type="GValue*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="instance">
+          <type name="TypeInstance" c:type="GTypeInstance*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_unset" c:identifier="g_value_unset">
+    <function name="type_name_from_class"
+              c:identifier="g_type_name_from_class">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="g_class">
+          <type name="TypeClass" c:type="GTypeClass*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_instance" c:identifier="g_value_set_instance">
+    <function name="value_c_init" c:identifier="g_value_c_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="value_types_init" c:identifier="g_value_types_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="enum_types_init" c:identifier="g_enum_types_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="param_type_init" c:identifier="g_param_type_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="boxed_type_init" c:identifier="g_boxed_type_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="object_type_init" c:identifier="g_object_type_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="param_spec_types_init"
+              c:identifier="g_param_spec_types_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="value_transforms_init"
+              c:identifier="g_value_transforms_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="signal_init" c:identifier="g_signal_init">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
+    </function>
+    <callback name="BoxedCopyFunc" c:type="GBoxedCopyFunc">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="boxed">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="instance">
+      </parameters>
+    </callback>
+    <callback name="BoxedFreeFunc" c:type="GBoxedFreeFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="boxed">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="value_fits_pointer" c:identifier="g_value_fits_pointer">
+    </callback>
+    <function name="boxed_copy" c:identifier="g_boxed_copy">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="boxed_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="src_boxed">
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_peek_pointer" c:identifier="g_value_peek_pointer">
+    <function name="boxed_free" c:identifier="g_boxed_free">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="boxed_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="boxed">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_type_compatible"
-              c:identifier="g_value_type_compatible">
+    <function name="value_set_boxed" c:identifier="g_value_set_boxed">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="src_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="dest_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="v_boxed">
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_type_transformable"
-              c:identifier="g_value_type_transformable">
+    <function name="value_set_static_boxed"
+              c:identifier="g_value_set_static_boxed">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="src_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="dest_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="v_boxed">
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_transform" c:identifier="g_value_transform">
+    <function name="value_get_boxed" c:identifier="g_value_get_boxed">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="src_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="dest_value">
-          <type name="GValue" c:type="GValue*"/>
+      </parameters>
+    </function>
+    <function name="value_dup_boxed" c:identifier="g_value_dup_boxed">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_register_transform_func"
-              c:identifier="g_value_register_transform_func">
+    <function name="boxed_type_register_static"
+              c:identifier="g_boxed_type_register_static">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="src_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="dest_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="boxed_copy">
+          <type name="BoxedCopyFunc" c:type="GBoxedCopyFunc"/>
         </parameter>
-        <parameter name="transform_func">
-          <type name="GValueTransform" c:type="GValueTransform"/>
+        <parameter name="boxed_free">
+          <type name="BoxedFreeFunc" c:type="GBoxedFreeFunc"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GParamFlags" c:type="GParamFlags">
-      <member name="readable" value="1" c:identifier="G_PARAM_READABLE"/>
-      <member name="writable" value="2" c:identifier="G_PARAM_WRITABLE"/>
-      <member name="construct" value="4" c:identifier="G_PARAM_CONSTRUCT"/>
-      <member name="construct_only"
-              value="8"
-              c:identifier="G_PARAM_CONSTRUCT_ONLY"/>
-      <member name="lax_validation"
-              value="16"
-              c:identifier="G_PARAM_LAX_VALIDATION"/>
-      <member name="static_name"
-              value="32"
-              c:identifier="G_PARAM_STATIC_NAME"/>
-      <member name="private" value="32" c:identifier="G_PARAM_PRIVATE"/>
-      <member name="static_nick"
-              value="64"
-              c:identifier="G_PARAM_STATIC_NICK"/>
-      <member name="static_blurb"
-              value="128"
-              c:identifier="G_PARAM_STATIC_BLURB"/>
-    </enumeration>
-    <record name="ParamSpec" c:type="GParamSpec"/>
-    <record name="Parameter" c:type="GParameter"/>
-    <record name="ParamSpecPool" c:type="GParamSpecPool"/>
-    <record name="GParamSpec" c:type="_GParamSpec">
-      <field name="g_type_instance">
-        <type name="GTypeInstance" c:type="GTypeInstance"/>
-      </field>
-      <field name="name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="flags">
-        <type name="GParamFlags" c:type="GParamFlags"/>
-      </field>
-      <field name="value_type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <field name="owner_type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <field name="_nick">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="_blurb">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="qdata">
-        <type name="GData" c:type="GData*"/>
-      </field>
-      <field name="ref_count">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="param_id">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="value_type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <callback name="finalize">
+    <function name="value_take_boxed" c:identifier="g_value_take_boxed">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="v_boxed">
+          <type name="any" c:type="gconstpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="value_set_boxed_take_ownership"
+              c:identifier="g_value_set_boxed_take_ownership">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="v_boxed">
+          <type name="any" c:type="gconstpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <glib:boxed c:type="Closure"
+                glib:name="Closure"
+                glib:type-name="GClosure"
+                glib:get-type="g_closure_get_type">
+      <constructor name="ref" c:identifier="g_closure_ref">
+        <return-value>
+          <type name="Closure" c:type="GClosure*"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_simple" c:identifier="g_closure_new_simple">
+        <return-value>
+          <type name="Closure" c:type="GClosure*"/>
+        </return-value>
+        <parameters>
+          <parameter name="sizeof_closure">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_object" c:identifier="g_closure_new_object">
+        <return-value>
+          <type name="Closure" c:type="GClosure*"/>
+        </return-value>
+        <parameters>
+          <parameter name="sizeof_closure">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="sink" c:identifier="g_closure_sink">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="value_set_default">
+      </method>
+      <method name="unref" c:identifier="g_closure_unref">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_finalize_notifier"
+              c:identifier="g_closure_add_finalize_notifier">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="notify_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify_func">
+            <type name="ClosureNotify" c:type="GClosureNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_finalize_notifier"
+              c:identifier="g_closure_remove_finalize_notifier">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="notify_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify_func">
+            <type name="ClosureNotify" c:type="GClosureNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_invalidate_notifier"
+              c:identifier="g_closure_add_invalidate_notifier">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="notify_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify_func">
+            <type name="ClosureNotify" c:type="GClosureNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_invalidate_notifier"
+              c:identifier="g_closure_remove_invalidate_notifier">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="notify_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify_func">
+            <type name="ClosureNotify" c:type="GClosureNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_marshal_guards"
+              c:identifier="g_closure_add_marshal_guards">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="pre_marshal_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="pre_marshal_notify">
+            <type name="ClosureNotify" c:type="GClosureNotify"/>
+          </parameter>
+          <parameter name="post_marshal_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="post_marshal_notify">
+            <type name="ClosureNotify" c:type="GClosureNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_marshal" c:identifier="g_closure_set_marshal">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="marshal">
+            <type name="ClosureMarshal" c:type="GClosureMarshal"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_meta_marshal"
+              c:identifier="g_closure_set_meta_marshal">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="marshal_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="meta_marshal">
+            <type name="ClosureMarshal" c:type="GClosureMarshal"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="invalidate" c:identifier="g_closure_invalidate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="invoke" c:identifier="g_closure_invoke">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+          <parameter name="return_value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_param_values">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="param_values">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="invocation_hint">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <glib:boxed c:type="ValueArray"
+                glib:name="ValueArray"
+                glib:type-name="GValueArray"
+                glib:get-type="g_value_array_get_type">
+      <constructor name="new" c:identifier="g_value_array_new">
+        <return-value>
+          <type name="ValueArray" c:type="GValueArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="n_prealloced">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="copy" c:identifier="g_value_array_copy">
+        <return-value>
+          <type name="ValueArray" c:type="GValueArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="prepend" c:identifier="g_value_array_prepend">
+        <return-value>
+          <type name="ValueArray" c:type="GValueArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="Value" c:type="GValue*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="value_validate">
+      </constructor>
+      <constructor name="append" c:identifier="g_value_array_append">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="ValueArray" c:type="GValueArray*"/>
         </return-value>
         <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="Value" c:type="GValue*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="values_cmp">
+      </constructor>
+      <constructor name="insert" c:identifier="g_value_array_insert">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="ValueArray" c:type="GValueArray*"/>
         </return-value>
         <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
           </parameter>
-          <parameter name="value1">
-            <type name="GValue" c:type="GValue*"/>
+          <parameter name="index_">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="value2">
-            <type name="GValue" c:type="GValue*"/>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
         </parameters>
-      </callback>
-      <field name="dummy">
+      </constructor>
+      <constructor name="remove" c:identifier="g_value_array_remove">
+        <return-value>
+          <type name="ValueArray" c:type="GValueArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="sort" c:identifier="g_value_array_sort">
+        <return-value>
+          <type name="ValueArray" c:type="GValueArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
+          </parameter>
+          <parameter name="compare_func">
+            <type name="GLib.CompareFunc" c:type="GCompareFunc"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="sort_with_data"
+                   c:identifier="g_value_array_sort_with_data">
+        <return-value>
+          <type name="ValueArray" c:type="GValueArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
+          </parameter>
+          <parameter name="compare_func">
+            <type name="GLib.CompareDataFunc" c:type="GCompareDataFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="free" c:identifier="g_value_array_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="value_array">
+            <type name="ValueArray" c:type="GValueArray*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <glib:boxed c:type="Date"
+                glib:name="Date"
+                glib:type-name="GDate"
+                glib:get-type="g_date_get_type">
+    </glib:boxed>
+    <glib:boxed c:type="Strv"
+                glib:name="Strv"
+                glib:type-name="GStrv"
+                glib:get-type="g_strv_get_type">
+    </glib:boxed>
+    <glib:boxed c:type="String"
+                glib:name="String"
+                glib:type-name="GString"
+                glib:get-type="g_gstring_get_type">
+    </glib:boxed>
+    <glib:boxed c:type="HashTable"
+                glib:name="HashTable"
+                glib:type-name="GHashTable"
+                glib:get-type="g_hash_table_get_type">
+    </glib:boxed>
+    <glib:boxed c:type="Regex"
+                glib:name="Regex"
+                glib:type-name="GRegex"
+                glib:get-type="g_regex_get_type">
+    </glib:boxed>
+    <record name="ClosureNotifyData" c:type="GClosureNotifyData">
+      <field name="data">
         <type name="any" c:type="gpointer"/>
       </field>
-    </record>
-    <record name="GParameter" c:type="_GParameter">
-      <field name="name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="value">
-        <type name="GValue" c:type="GValue"/>
+      <field name="notify">
+        <type name="ClosureNotify" c:type="GClosureNotify"/>
       </field>
     </record>
-    <function name="param_spec_ref" c:identifier="g_param_spec_ref">
-      <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_unref" c:identifier="g_param_spec_unref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_sink" c:identifier="g_param_spec_sink">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_ref_sink" c:identifier="g_param_spec_ref_sink">
-      <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_get_qdata"
-              c:identifier="g_param_spec_get_qdata">
+    <callback name="Callback" c:type="GCallback">
       <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_set_qdata"
-              c:identifier="g_param_spec_set_qdata">
+        <type name="none" c:type="void"/>
+      </return-value>
+    </callback>
+    <callback name="ClosureNotify" c:type="GClosureNotify">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
       </parameters>
-    </function>
-    <function name="param_spec_set_qdata_full"
-              c:identifier="g_param_spec_set_qdata_full">
+    </callback>
+    <callback name="ClosureMarshal" c:type="GClosureMarshal">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="param_spec_steal_qdata"
-              c:identifier="g_param_spec_steal_qdata">
-      <return-value>
+    </callback>
+    <record name="CClosure" c:type="GCClosure">
+      <field name="closure">
+        <type name="Closure" c:type="GClosure"/>
+      </field>
+      <field name="callback">
         <type name="any" c:type="gpointer"/>
+      </field>
+    </record>
+    <function name="cclosure_new" c:identifier="g_cclosure_new">
+      <return-value>
+        <type name="Closure" c:type="GClosure*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="callback_func">
+          <type name="Callback" c:type="GCallback"/>
         </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_get_redirect_target"
-              c:identifier="g_param_spec_get_redirect_target">
-      <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="destroy_data">
+          <type name="ClosureNotify" c:type="GClosureNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_value_set_default"
-              c:identifier="g_param_value_set_default">
+    <function name="cclosure_new_swap" c:identifier="g_cclosure_new_swap">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Closure" c:type="GClosure*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="callback_func">
+          <type name="Callback" c:type="GCallback"/>
         </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy_data">
+          <type name="ClosureNotify" c:type="GClosureNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_value_defaults"
-              c:identifier="g_param_value_defaults">
+    <function name="signal_type_cclosure_new"
+              c:identifier="g_signal_type_cclosure_new">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="Closure" c:type="GClosure*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="itype">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="struct_offset">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_value_validate"
-              c:identifier="g_param_value_validate">
+    <record name="EnumClass" c:type="GEnumClass">
+      <field name="g_type_class">
+        <type name="TypeClass" c:type="GTypeClass"/>
+      </field>
+      <field name="minimum">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="maximum">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="n_values">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="values">
+        <type name="EnumValue" c:type="GEnumValue*"/>
+      </field>
+    </record>
+    <record name="FlagsClass" c:type="GFlagsClass">
+      <field name="g_type_class">
+        <type name="TypeClass" c:type="GTypeClass"/>
+      </field>
+      <field name="mask">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="n_values">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="values">
+        <type name="FlagsValue" c:type="GFlagsValue*"/>
+      </field>
+    </record>
+    <record name="EnumValue" c:type="GEnumValue">
+      <field name="value">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="value_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="value_nick">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <record name="FlagsValue" c:type="GFlagsValue">
+      <field name="value">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="value_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="value_nick">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <function name="enum_get_value" c:identifier="g_enum_get_value">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="EnumValue" c:type="GEnumValue*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="enum_class">
+          <type name="EnumClass" c:type="GEnumClass*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_value_convert" c:identifier="g_param_value_convert">
+    <function name="enum_get_value_by_name"
+              c:identifier="g_enum_get_value_by_name">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="EnumValue" c:type="GEnumValue*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="src_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="dest_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="enum_class">
+          <type name="EnumClass" c:type="GEnumClass*"/>
         </parameter>
-        <parameter name="strict_validation">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_values_cmp" c:identifier="g_param_values_cmp">
+    <function name="enum_get_value_by_nick"
+              c:identifier="g_enum_get_value_by_nick">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="EnumValue" c:type="GEnumValue*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="value1">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="enum_class">
+          <type name="EnumClass" c:type="GEnumClass*"/>
         </parameter>
-        <parameter name="value2">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_get_name" c:identifier="g_param_spec_get_name">
+    <function name="flags_get_first_value"
+              c:identifier="g_flags_get_first_value">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="FlagsValue" c:type="GFlagsValue*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="flags_class">
+          <type name="FlagsClass" c:type="GFlagsClass*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_get_nick" c:identifier="g_param_spec_get_nick">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="value">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_get_blurb"
-              c:identifier="g_param_spec_get_blurb">
+    <function name="flags_get_value_by_name"
+              c:identifier="g_flags_get_value_by_name">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="FlagsValue" c:type="GFlagsValue*"/>
       </return-value>
       <parameters>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="flags_class">
+          <type name="FlagsClass" c:type="GFlagsClass*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_param" c:identifier="g_value_set_param">
+    <function name="flags_get_value_by_nick"
+              c:identifier="g_flags_get_value_by_nick">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="FlagsValue" c:type="GFlagsValue*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="flags_class">
+          <type name="FlagsClass" c:type="GFlagsClass*"/>
         </parameter>
-        <parameter name="param">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_param" c:identifier="g_value_get_param">
+    <function name="enum_register_static"
+              c:identifier="g_enum_register_static">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="const_static_values">
+          <type name="EnumValue" c:type="GEnumValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_dup_param" c:identifier="g_value_dup_param">
+    <function name="flags_register_static"
+              c:identifier="g_flags_register_static">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="const_static_values">
+          <type name="FlagsValue" c:type="GFlagsValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_take_param" c:identifier="g_value_take_param">
+    <function name="enum_complete_type_info"
+              c:identifier="g_enum_complete_type_info">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="g_enum_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="info">
+          <type name="TypeInfo" c:type="GTypeInfo*"/>
         </parameter>
-        <parameter name="param">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="const_values">
+          <type name="EnumValue" c:type="GEnumValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_param_take_ownership"
-              c:identifier="g_value_set_param_take_ownership">
+    <function name="flags_complete_type_info"
+              c:identifier="g_flags_complete_type_info">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="g_flags_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="info">
+          <type name="TypeInfo" c:type="GTypeInfo*"/>
         </parameter>
-        <parameter name="param">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="const_values">
+          <type name="FlagsValue" c:type="GFlagsValue*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="ParamSpecTypeInfo" c:type="GParamSpecTypeInfo"/>
-    <record name="GParamSpecTypeInfo" c:type="_GParamSpecTypeInfo">
-      <field name="instance_size">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="n_preallocs">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <callback name="instance_init">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="value_type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <callback name="finalize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="value_set_default">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="value_validate">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="values_cmp">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-          <parameter name="value1">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="value2">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <function name="param_type_register_static"
-              c:identifier="g_param_type_register_static">
+    <function name="cclosure_marshal_VOID__VOID"
+              c:identifier="g_cclosure_marshal_VOID__VOID">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="pspec_info">
-          <type name="GParamSpecTypeInfo" c:type="GParamSpecTypeInfo*"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="g_param_type_register_static_constant"
-              c:identifier="_g_param_type_register_static_constant">
+    <function name="cclosure_marshal_VOID__BOOLEAN"
+              c:identifier="g_cclosure_marshal_VOID__BOOLEAN">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="pspec_info">
-          <type name="GParamSpecTypeInfo" c:type="GParamSpecTypeInfo*"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="opt_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_internal" c:identifier="g_param_spec_internal">
+    <function name="cclosure_marshal_VOID__CHAR"
+              c:identifier="g_cclosure_marshal_VOID__CHAR">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="param_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_pool_new" c:identifier="g_param_spec_pool_new">
+    <function name="cclosure_marshal_VOID__UCHAR"
+              c:identifier="g_cclosure_marshal_VOID__UCHAR">
       <return-value>
-        <type name="GParamSpecPool" c:type="GParamSpecPool*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="type_prefixing">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_pool_insert"
-              c:identifier="g_param_spec_pool_insert">
+    <function name="cclosure_marshal_VOID__INT"
+              c:identifier="g_cclosure_marshal_VOID__INT">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="pool">
-          <type name="GParamSpecPool" c:type="GParamSpecPool*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="owner_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_pool_remove"
-              c:identifier="g_param_spec_pool_remove">
+    <function name="cclosure_marshal_VOID__UINT"
+              c:identifier="g_cclosure_marshal_VOID__UINT">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="pool">
-          <type name="GParamSpecPool" c:type="GParamSpecPool*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_pool_lookup"
-              c:identifier="g_param_spec_pool_lookup">
+    <function name="cclosure_marshal_VOID__LONG"
+              c:identifier="g_cclosure_marshal_VOID__LONG">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="pool">
-          <type name="GParamSpecPool" c:type="GParamSpecPool*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="param_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="owner_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="walk_ancestors">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_pool_list_owned"
-              c:identifier="g_param_spec_pool_list_owned">
+    <function name="cclosure_marshal_VOID__ULONG"
+              c:identifier="g_cclosure_marshal_VOID__ULONG">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="pool">
-          <type name="GParamSpecPool" c:type="GParamSpecPool*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="owner_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_pool_list"
-              c:identifier="g_param_spec_pool_list">
+    <function name="cclosure_marshal_VOID__ENUM"
+              c:identifier="g_cclosure_marshal_VOID__ENUM">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec**"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="pool">
-          <type name="GParamSpecPool" c:type="GParamSpecPool*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="owner_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="n_pspecs_p">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <record name="SignalQuery" c:type="GSignalQuery"/>
-    <record name="SignalInvocationHint" c:type="GSignalInvocationHint"/>
-    <callback name="GSignalEmissionHook">
+    <function name="cclosure_marshal_VOID__FLAGS"
+              c:identifier="g_cclosure_marshal_VOID__FLAGS">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ihint">
-          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GSignalAccumulator">
+    </function>
+    <function name="cclosure_marshal_VOID__FLOAT"
+              c:identifier="g_cclosure_marshal_VOID__FLOAT">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ihint">
-          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="return_accu">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="handler_return">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </callback>
-    <enumeration name="GSignalFlags" c:type="GSignalFlags">
-      <member name="run_first" value="1" c:identifier="G_SIGNAL_RUN_FIRST"/>
-      <member name="run_last" value="2" c:identifier="G_SIGNAL_RUN_LAST"/>
-      <member name="run_cleanup"
-              value="4"
-              c:identifier="G_SIGNAL_RUN_CLEANUP"/>
-      <member name="no_recurse" value="8" c:identifier="G_SIGNAL_NO_RECURSE"/>
-      <member name="detailed" value="16" c:identifier="G_SIGNAL_DETAILED"/>
-      <member name="action" value="32" c:identifier="G_SIGNAL_ACTION"/>
-      <member name="no_hooks" value="64" c:identifier="G_SIGNAL_NO_HOOKS"/>
-    </enumeration>
-    <enumeration name="GConnectFlags" c:type="GConnectFlags">
-      <member name="after" value="1" c:identifier="G_CONNECT_AFTER"/>
-      <member name="swapped" value="2" c:identifier="G_CONNECT_SWAPPED"/>
-    </enumeration>
-    <enumeration name="GSignalMatchType" c:type="GSignalMatchType">
-      <member name="id" value="1" c:identifier="G_SIGNAL_MATCH_ID"/>
-      <member name="detail" value="2" c:identifier="G_SIGNAL_MATCH_DETAIL"/>
-      <member name="closure" value="4" c:identifier="G_SIGNAL_MATCH_CLOSURE"/>
-      <member name="func" value="8" c:identifier="G_SIGNAL_MATCH_FUNC"/>
-      <member name="data" value="16" c:identifier="G_SIGNAL_MATCH_DATA"/>
-      <member name="unblocked"
-              value="32"
-              c:identifier="G_SIGNAL_MATCH_UNBLOCKED"/>
-    </enumeration>
-    <record name="GSignalInvocationHint" c:type="_GSignalInvocationHint">
-      <field name="signal_id">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="detail">
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </field>
-      <field name="run_type">
-        <type name="GSignalFlags" c:type="GSignalFlags"/>
-      </field>
-    </record>
-    <record name="GSignalQuery" c:type="_GSignalQuery">
-      <field name="signal_id">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="signal_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="itype">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <field name="signal_flags">
-        <type name="GSignalFlags" c:type="GSignalFlags"/>
-      </field>
-      <field name="return_type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <field name="n_params">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="param_types">
-        <type name="GType" c:type="GType*"/>
-      </field>
-    </record>
-    <function name="signal_newv" c:identifier="g_signal_newv">
+    </function>
+    <function name="cclosure_marshal_VOID__DOUBLE"
+              c:identifier="g_cclosure_marshal_VOID__DOUBLE">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cclosure_marshal_VOID__STRING"
+              c:identifier="g_cclosure_marshal_VOID__STRING">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="signal_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="signal_flags">
-          <type name="GSignalFlags" c:type="GSignalFlags"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="class_closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="accumulator">
-          <type name="GSignalAccumulator" c:type="GSignalAccumulator"/>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="accu_data">
+        <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="c_marshaller">
-          <type name="GSignalCMarshaller" c:type="GSignalCMarshaller"/>
+      </parameters>
+    </function>
+    <function name="cclosure_marshal_VOID__PARAM"
+              c:identifier="g_cclosure_marshal_VOID__PARAM">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="return_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="n_params">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="param_types">
-          <type name="GType" c:type="GType*"/>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_new" c:identifier="g_signal_new">
+    <function name="cclosure_marshal_VOID__BOXED"
+              c:identifier="g_cclosure_marshal_VOID__BOXED">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="signal_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="signal_flags">
-          <type name="GSignalFlags" c:type="GSignalFlags"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="class_offset">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="accumulator">
-          <type name="GSignalAccumulator" c:type="GSignalAccumulator"/>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="accu_data">
+        <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="c_marshaller">
-          <type name="GSignalCMarshaller" c:type="GSignalCMarshaller"/>
-        </parameter>
-        <parameter name="return_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="n_params">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emitv" c:identifier="g_signal_emitv">
+    <function name="cclosure_marshal_VOID__POINTER"
+              c:identifier="g_cclosure_marshal_VOID__POINTER">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance_and_params">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emit" c:identifier="g_signal_emit">
+    <function name="cclosure_marshal_VOID__OBJECT"
+              c:identifier="g_cclosure_marshal_VOID__OBJECT">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emit_by_name" c:identifier="g_signal_emit_by_name">
+    <function name="cclosure_marshal_VOID__UINT_POINTER"
+              c:identifier="g_cclosure_marshal_VOID__UINT_POINTER">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="detailed_signal">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_lookup" c:identifier="g_signal_lookup">
+    <function name="cclosure_marshal_BOOLEAN__FLAGS"
+              c:identifier="g_cclosure_marshal_BOOLEAN__FLAGS">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_name" c:identifier="g_signal_name">
+    <function name="cclosure_marshal_STRING__OBJECT_POINTER"
+              c:identifier="g_cclosure_marshal_STRING__OBJECT_POINTER">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_query" c:identifier="g_signal_query">
+    <callback name="ValueTransform" c:type="GValueTransform">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="src_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="query">
-          <type name="GSignalQuery" c:type="GSignalQuery*"/>
+        <parameter name="dest_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="signal_list_ids" c:identifier="g_signal_list_ids">
+    </callback>
+    <function name="value_type_compatible"
+              c:identifier="g_value_type_compatible">
       <return-value>
-        <type name="GLib.guint" c:type="guint*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
+        <parameter name="src_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="n_ids">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="dest_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_parse_name" c:identifier="g_signal_parse_name">
+    <function name="value_type_transformable"
+              c:identifier="g_value_type_transformable">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="detailed_signal">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="src_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
+        <parameter name="dest_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="signal_id_p">
-          <type name="GLib.guint" c:type="guint*"/>
+      </parameters>
+    </function>
+    <function name="value_register_transform_func"
+              c:identifier="g_value_register_transform_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="src_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="detail_p">
-          <type name="GLib.GQuark" c:type="GQuark*"/>
+        <parameter name="dest_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="force_detail_quark">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="transform_func">
+          <type name="ValueTransform" c:type="GValueTransform"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_get_invocation_hint"
-              c:identifier="g_signal_get_invocation_hint">
+    <enumeration name="ParamFlags" c:type="GParamFlags">
+      <member name="readable" value="1" c:identifier="G_PARAM_READABLE"/>
+      <member name="writable" value="2" c:identifier="G_PARAM_WRITABLE"/>
+      <member name="construct" value="4" c:identifier="G_PARAM_CONSTRUCT"/>
+      <member name="constructonly"
+              value="8"
+              c:identifier="G_PARAM_CONSTRUCT_ONLY"/>
+      <member name="laxvalidation"
+              value="16"
+              c:identifier="G_PARAM_LAX_VALIDATION"/>
+      <member name="staticname" value="32" c:identifier="G_PARAM_STATIC_NAME"/>
+      <member name="private" value="32" c:identifier="G_PARAM_PRIVATE"/>
+      <member name="staticnick" value="64" c:identifier="G_PARAM_STATIC_NICK"/>
+      <member name="staticblurb"
+              value="128"
+              c:identifier="G_PARAM_STATIC_BLURB"/>
+    </enumeration>
+    <record name="ParamSpec" c:type="GParamSpec">
+      <field name="g_type_instance">
+        <type name="TypeInstance" c:type="GTypeInstance"/>
+      </field>
+      <field name="name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="flags">
+        <type name="ParamFlags" c:type="GParamFlags"/>
+      </field>
+      <field name="value_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+      <field name="owner_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+      <field name="_nick">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="_blurb">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="qdata">
+        <type name="GLib.Data" c:type="GData*"/>
+      </field>
+      <field name="ref_count">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="param_id">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="ParamSpecClass" c:type="GParamSpecClass">
+      <field name="g_type_class">
+        <type name="TypeClass" c:type="GTypeClass"/>
+      </field>
+      <field name="value_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+      <callback name="finalize" c:type="finalize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="value_set_default" c:type="value_set_default">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="value_validate" c:type="value_validate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="values_cmp" c:type="values_cmp">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+          <parameter name="value1">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="value2">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="dummy">
+        <type name="any" c:type="gpointer"/>
+      </field>
+    </record>
+    <record name="Parameter" c:type="GParameter">
+      <field name="name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="value">
+        <type name="Value" c:type="GValue"/>
+      </field>
+    </record>
+    <record name="ParamSpecPool" c:type="GParamSpecPool"/>
+    <function name="param_spec_ref" c:identifier="g_param_spec_ref">
       <return-value>
-        <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_stop_emission"
-              c:identifier="g_signal_stop_emission">
+    <function name="param_spec_unref" c:identifier="g_param_spec_unref">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_stop_emission_by_name"
-              c:identifier="g_signal_stop_emission_by_name">
+    <function name="param_spec_sink" c:identifier="g_param_spec_sink">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="detailed_signal">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_add_emission_hook"
-              c:identifier="g_signal_add_emission_hook">
-      <return-value>
-        <type name="ulong" c:type="gulong"/>
-      </return-value>
-      <parameters>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="hook_func">
-          <type name="GSignalEmissionHook" c:type="GSignalEmissionHook"/>
-        </parameter>
-        <parameter name="hook_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="data_destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_remove_emission_hook"
-              c:identifier="g_signal_remove_emission_hook">
+    <function name="param_spec_ref_sink" c:identifier="g_param_spec_ref_sink">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="hook_id">
-          <type name="ulong" c:type="gulong"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_has_handler_pending"
-              c:identifier="g_signal_has_handler_pending">
+    <function name="param_spec_get_qdata"
+              c:identifier="g_param_spec_get_qdata">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="may_be_blocked">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="quark">
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_closure_by_id"
-              c:identifier="g_signal_connect_closure_by_id">
+    <function name="param_spec_set_qdata"
+              c:identifier="g_param_spec_set_qdata">
       <return-value>
-        <type name="ulong" c:type="gulong"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="after">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="quark">
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="signal_connect_closure"
-              c:identifier="g_signal_connect_closure">
-      <return-value>
-        <type name="ulong" c:type="gulong"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
+        <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="detailed_signal">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="after">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_data" c:identifier="g_signal_connect_data">
+    <function name="param_spec_set_qdata_full"
+              c:identifier="g_param_spec_set_qdata_full">
       <return-value>
-        <type name="ulong" c:type="gulong"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="detailed_signal">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="c_handler">
-          <type name="GCallback" c:type="GCallback"/>
+        <parameter name="quark">
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="destroy_data">
-          <type name="GClosureNotify" c:type="GClosureNotify"/>
-        </parameter>
-        <parameter name="connect_flags">
-          <type name="GConnectFlags" c:type="GConnectFlags"/>
+        <parameter name="destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_handler_block"
-              c:identifier="g_signal_handler_block">
+    <function name="param_spec_steal_qdata"
+              c:identifier="g_param_spec_steal_qdata">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="handler_id">
-          <type name="ulong" c:type="gulong"/>
+        <parameter name="quark">
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_handler_unblock"
-              c:identifier="g_signal_handler_unblock">
+    <function name="param_spec_get_redirect_target"
+              c:identifier="g_param_spec_get_redirect_target">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="handler_id">
-          <type name="ulong" c:type="gulong"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_handler_disconnect"
-              c:identifier="g_signal_handler_disconnect">
+    <function name="param_value_set_default"
+              c:identifier="g_param_value_set_default">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="handler_id">
-          <type name="ulong" c:type="gulong"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_handler_is_connected"
-              c:identifier="g_signal_handler_is_connected">
+    <function name="param_value_defaults"
+              c:identifier="g_param_value_defaults">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="handler_id">
-          <type name="ulong" c:type="gulong"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_handler_find" c:identifier="g_signal_handler_find">
-      <return-value>
-        <type name="ulong" c:type="gulong"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_handlers_block_matched"
-              c:identifier="g_signal_handlers_block_matched">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_handlers_unblock_matched"
-              c:identifier="g_signal_handlers_unblock_matched">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_handlers_disconnect_matched"
-              c:identifier="g_signal_handlers_disconnect_matched">
+    <function name="param_value_validate"
+              c:identifier="g_param_value_validate">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_override_class_closure"
-              c:identifier="g_signal_override_class_closure">
+    <function name="param_value_convert" c:identifier="g_param_value_convert">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="instance_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="src_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="class_closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="dest_value">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="strict_validation">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_chain_from_overridden"
-              c:identifier="g_signal_chain_from_overridden">
+    <function name="param_values_cmp" c:identifier="g_param_values_cmp">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="instance_and_params">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="value1">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="value2">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_accumulator_true_handled"
-              c:identifier="g_signal_accumulator_true_handled">
+    <function name="param_spec_get_name" c:identifier="g_param_spec_get_name">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="ihint">
-          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
-        </parameter>
-        <parameter name="return_accu">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="handler_return">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="dummy">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_handlers_destroy"
-              c:identifier="g_signal_handlers_destroy">
+    <function name="param_spec_get_nick" c:identifier="g_param_spec_get_nick">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="g_signals_destroy" c:identifier="_g_signals_destroy">
+    <function name="param_spec_get_blurb"
+              c:identifier="g_param_spec_get_blurb">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Object"
-           c:type="GObject"
-           glib:type-name="GObject"
-           glib:get-type="intern">
-      <field name="construct_properties">
-        <type name="GLib.GSList" c:type="GSList*"/>
+    <record name="ParamSpecTypeInfo" c:type="GParamSpecTypeInfo">
+      <field name="instance_size">
+        <type name="uint16" c:type="guint16"/>
       </field>
-      <callback name="constructor">
-        <return-value>
-          <type name="Object" c:type="GObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="type">
-            <type name="GType" c:type="GType"/>
-          </parameter>
-          <parameter name="n_construct_properties">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="construct_properties">
-            <type name="GObjectConstructParam"
-                  c:type="GObjectConstructParam*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_property">
+      <field name="n_preallocs">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <callback name="instance_init" c:type="instance_init">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="property_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
+            <type name="ParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_property">
+      <field name="value_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+      <callback name="finalize" c:type="finalize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="property_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
+            <type name="ParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="dispose">
+      <callback name="value_set_default" c:type="value_set_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="GObject*"/>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="finalize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="GObject*"/>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="dispatch_properties_changed">
+      <callback name="value_validate" c:type="value_validate">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="n_pspecs">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
           </parameter>
-          <parameter name="pspecs">
-            <type name="GParamSpec" c:type="GParamSpec**"/>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="notify">
+      <callback name="values_cmp" c:type="values_cmp">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="GObject*"/>
-          </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="constructed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="GObject*"/>
+            <type name="ParamSpec" c:type="GParamSpec*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <field name="pdummy">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <glib:signal name="notify">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GParam" c:type="GParam"/>
+          <parameter name="value1">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <class name="InitiallyUnowned"
-           c:type="GInitiallyUnowned"
-           parent="GObject"
-           glib:type-name="GInitiallyUnowned"
-           glib:get-type="g_initially_unowned_get_type">
-      <glib:signal name="notify">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GParam" c:type="GParam"/>
+          <parameter name="value2">
+            <type name="Value" c:type="GValue*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <record name="ObjectConstructParam" c:type="GObjectConstructParam"/>
-    <callback name="GObjectGetPropertyFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="property_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GObjectSetPropertyFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="property_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GObjectFinalizeFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GWeakNotify">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="where_the_object_was">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GObjectConstructParam" c:type="_GObjectConstructParam">
-      <field name="pspec">
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </field>
-      <field name="value">
-        <type name="GValue" c:type="GValue*"/>
-      </field>
+      </callback>
     </record>
-    <function name="object_class_install_property"
-              c:identifier="g_object_class_install_property">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="oclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
-        </parameter>
-        <parameter name="property_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_class_find_property"
-              c:identifier="g_object_class_find_property">
-      <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="oclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
-        </parameter>
-        <parameter name="property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_class_list_properties"
-              c:identifier="g_object_class_list_properties">
+    <function name="param_type_register_static"
+              c:identifier="g_param_type_register_static">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec**"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="oclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="n_properties">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="pspec_info">
+          <type name="ParamSpecTypeInfo" c:type="GParamSpecTypeInfo*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_class_override_property"
-              c:identifier="g_object_class_override_property">
+    <function name="param_type_register_static_constant"
+              c:identifier="_g_param_type_register_static_constant">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
-        <parameter name="oclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
-        </parameter>
-        <parameter name="property_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="object_interface_install_property"
-              c:identifier="g_object_interface_install_property">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pspec_info">
+          <type name="ParamSpecTypeInfo" c:type="GParamSpecTypeInfo*"/>
         </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="opt_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_interface_find_property"
-              c:identifier="g_object_interface_find_property">
+    <function name="param_spec_internal" c:identifier="g_param_spec_internal">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="param_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="property_name">
+        <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="object_interface_list_properties"
-              c:identifier="g_object_interface_list_properties">
-      <return-value>
-        <type name="GParamSpec" c:type="GParamSpec**"/>
-      </return-value>
-      <parameters>
-        <parameter name="g_iface">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="n_properties_p">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_new" c:identifier="g_object_new">
+    <function name="param_spec_pool_new" c:identifier="g_param_spec_pool_new">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="ParamSpecPool" c:type="GParamSpecPool*"/>
       </return-value>
       <parameters>
-        <parameter name="object_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="type_prefixing">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_newv" c:identifier="g_object_newv">
+    <function name="param_spec_pool_insert"
+              c:identifier="g_param_spec_pool_insert">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="pool">
+          <type name="ParamSpecPool" c:type="GParamSpecPool*"/>
         </parameter>
-        <parameter name="n_parameters">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="parameters">
-          <type name="GParameter" c:type="GParameter*"/>
+        <parameter name="owner_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_set" c:identifier="g_object_set">
+    <function name="param_spec_pool_remove"
+              c:identifier="g_param_spec_pool_remove">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pool">
+          <type name="ParamSpecPool" c:type="GParamSpecPool*"/>
         </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_get" c:identifier="g_object_get">
+    <function name="param_spec_pool_lookup"
+              c:identifier="g_param_spec_pool_lookup">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pool">
+          <type name="ParamSpecPool" c:type="GParamSpecPool*"/>
         </parameter>
-        <parameter name="first_property_name">
+        <parameter name="param_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="object_connect" c:identifier="g_object_connect">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="owner_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="signal_spec">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="walk_ancestors">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_disconnect" c:identifier="g_object_disconnect">
+    <function name="param_spec_pool_list_owned"
+              c:identifier="g_param_spec_pool_list_owned">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="pool">
+          <type name="ParamSpecPool" c:type="GParamSpecPool*"/>
         </parameter>
-        <parameter name="signal_spec">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="owner_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_set_property" c:identifier="g_object_set_property">
+    <function name="param_spec_pool_list"
+              c:identifier="g_param_spec_pool_list">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="pool">
+          <type name="ParamSpecPool" c:type="GParamSpecPool*"/>
         </parameter>
-        <parameter name="property_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="owner_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="n_pspecs_p">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_get_property" c:identifier="g_object_get_property">
+    <record name="SignalQuery" c:type="GSignalQuery">
+      <field name="signal_id">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="signal_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="itype">
+        <type name="Type" c:type="GType"/>
+      </field>
+      <field name="signal_flags">
+        <type name="SignalFlags" c:type="GSignalFlags"/>
+      </field>
+      <field name="return_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+      <field name="n_params">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="param_types">
+        <type name="Type" c:type="GType*"/>
+      </field>
+    </record>
+    <record name="SignalInvocationHint" c:type="GSignalInvocationHint">
+      <field name="signal_id">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="detail">
+        <type name="Quark" c:type="GQuark"/>
+      </field>
+      <field name="run_type">
+        <type name="SignalFlags" c:type="GSignalFlags"/>
+      </field>
+    </record>
+    <callback name="SignalEmissionHook" c:type="GSignalEmissionHook">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="ihint">
+          <type name="SignalInvocationHint" c:type="GSignalInvocationHint*"/>
         </parameter>
-        <parameter name="property_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="param_values">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="object_freeze_notify"
-              c:identifier="g_object_freeze_notify">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="object_notify" c:identifier="g_object_notify">
+    </callback>
+    <callback name="SignalAccumulator" c:type="GSignalAccumulator">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="ihint">
+          <type name="SignalInvocationHint" c:type="GSignalInvocationHint*"/>
         </parameter>
-        <parameter name="property_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="return_accu">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="handler_return">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="object_thaw_notify" c:identifier="g_object_thaw_notify">
+    </callback>
+    <enumeration name="SignalFlags" c:type="GSignalFlags">
+      <member name="runfirst" value="1" c:identifier="G_SIGNAL_RUN_FIRST"/>
+      <member name="runlast" value="2" c:identifier="G_SIGNAL_RUN_LAST"/>
+      <member name="runcleanup" value="4" c:identifier="G_SIGNAL_RUN_CLEANUP"/>
+      <member name="norecurse" value="8" c:identifier="G_SIGNAL_NO_RECURSE"/>
+      <member name="detailed" value="16" c:identifier="G_SIGNAL_DETAILED"/>
+      <member name="action" value="32" c:identifier="G_SIGNAL_ACTION"/>
+      <member name="nohooks" value="64" c:identifier="G_SIGNAL_NO_HOOKS"/>
+    </enumeration>
+    <enumeration name="ConnectFlags" c:type="GConnectFlags">
+      <member name="after" value="1" c:identifier="G_CONNECT_AFTER"/>
+      <member name="swapped" value="2" c:identifier="G_CONNECT_SWAPPED"/>
+    </enumeration>
+    <enumeration name="SignalMatchType" c:type="GSignalMatchType">
+      <member name="id" value="1" c:identifier="G_SIGNAL_MATCH_ID"/>
+      <member name="detail" value="2" c:identifier="G_SIGNAL_MATCH_DETAIL"/>
+      <member name="closure" value="4" c:identifier="G_SIGNAL_MATCH_CLOSURE"/>
+      <member name="func" value="8" c:identifier="G_SIGNAL_MATCH_FUNC"/>
+      <member name="data" value="16" c:identifier="G_SIGNAL_MATCH_DATA"/>
+      <member name="unblocked"
+              value="32"
+              c:identifier="G_SIGNAL_MATCH_UNBLOCKED"/>
+    </enumeration>
+    <function name="signal_newv" c:identifier="g_signal_newv">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="signal_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="itype">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="signal_flags">
+          <type name="SignalFlags" c:type="GSignalFlags"/>
+        </parameter>
+        <parameter name="class_closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="accumulator">
+          <type name="SignalAccumulator" c:type="GSignalAccumulator"/>
+        </parameter>
+        <parameter name="accu_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="c_marshaller">
+          <type name="SignalCMarshaller" c:type="GSignalCMarshaller"/>
+        </parameter>
+        <parameter name="return_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="n_params">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_types">
+          <type name="Type" c:type="GType*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_is_floating" c:identifier="g_object_is_floating">
+    <function name="signal_new" c:identifier="g_signal_new">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="object">
+        <parameter name="signal_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="itype">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="signal_flags">
+          <type name="SignalFlags" c:type="GSignalFlags"/>
+        </parameter>
+        <parameter name="class_offset">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="accumulator">
+          <type name="SignalAccumulator" c:type="GSignalAccumulator"/>
+        </parameter>
+        <parameter name="accu_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="c_marshaller">
+          <type name="SignalCMarshaller" c:type="GSignalCMarshaller"/>
+        </parameter>
+        <parameter name="return_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="n_params">
+          <type name="uint" c:type="guint"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="object_ref_sink" c:identifier="g_object_ref_sink">
+    <function name="signal_emitv" c:identifier="g_signal_emitv">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="instance_and_params">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_ref" c:identifier="g_object_ref">
+    <function name="signal_emit" c:identifier="g_signal_emit">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
+        <parameter name="instance">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="object_unref" c:identifier="g_object_unref">
+    <function name="signal_emit_by_name" c:identifier="g_signal_emit_by_name">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
+        <parameter name="instance">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="detailed_signal">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="object_weak_ref" c:identifier="g_object_weak_ref">
+    <function name="signal_lookup" c:identifier="g_signal_lookup">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GWeakNotify" c:type="GWeakNotify"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="itype">
+          <type name="Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_weak_unref" c:identifier="g_object_weak_unref">
+    <function name="signal_name" c:identifier="g_signal_name">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GWeakNotify" c:type="GWeakNotify"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_add_weak_pointer"
-              c:identifier="g_object_add_weak_pointer">
+    <function name="signal_query" c:identifier="g_signal_query">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="weak_pointer_location">
-          <type name="gpointer" c:type="gpointer*"/>
+        <parameter name="query">
+          <type name="SignalQuery" c:type="GSignalQuery*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_remove_weak_pointer"
-              c:identifier="g_object_remove_weak_pointer">
+    <function name="signal_list_ids" c:identifier="g_signal_list_ids">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="uint" c:type="guint*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="itype">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="weak_pointer_location">
-          <type name="gpointer" c:type="gpointer*"/>
+        <parameter name="n_ids">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GToggleNotify">
+    <function name="signal_parse_name" c:identifier="g_signal_parse_name">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="detailed_signal">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="itype">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="is_last_ref">
+        <parameter name="signal_id_p">
+          <type name="uint" c:type="guint*"/>
+        </parameter>
+        <parameter name="detail_p">
+          <type name="Quark" c:type="GQuark*"/>
+        </parameter>
+        <parameter name="force_detail_quark">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="object_add_toggle_ref"
-              c:identifier="g_object_add_toggle_ref">
+    </function>
+    <function name="signal_get_invocation_hint"
+              c:identifier="g_signal_get_invocation_hint">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="SignalInvocationHint" c:type="GSignalInvocationHint*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GToggleNotify" c:type="GToggleNotify"/>
-        </parameter>
-        <parameter name="data">
+        <parameter name="instance">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_remove_toggle_ref"
-              c:identifier="g_object_remove_toggle_ref">
+    <function name="signal_stop_emission"
+              c:identifier="g_signal_stop_emission">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="notify">
-          <type name="GToggleNotify" c:type="GToggleNotify"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_get_qdata" c:identifier="g_object_get_qdata">
+    <function name="signal_stop_emission_by_name"
+              c:identifier="g_signal_stop_emission_by_name">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="detailed_signal">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_set_qdata" c:identifier="g_object_set_qdata">
+    <function name="signal_add_emission_hook"
+              c:identifier="g_signal_add_emission_hook">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="hook_func">
+          <type name="SignalEmissionHook" c:type="GSignalEmissionHook"/>
+        </parameter>
+        <parameter name="hook_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="data_destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="object_set_qdata_full"
-              c:identifier="g_object_set_qdata_full">
+    <function name="signal_remove_emission_hook"
+              c:identifier="g_signal_remove_emission_hook">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="hook_id">
+          <type name="ulong" c:type="gulong"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_steal_qdata" c:identifier="g_object_steal_qdata">
+    <function name="signal_has_handler_pending"
+              c:identifier="g_signal_has_handler_pending">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="may_be_blocked">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_get_data" c:identifier="g_object_get_data">
+    <function name="signal_connect_closure_by_id"
+              c:identifier="g_signal_connect_closure_by_id">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="after">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_set_data" c:identifier="g_object_set_data">
+    <function name="signal_connect_closure"
+              c:identifier="g_signal_connect_closure">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="key">
+        <parameter name="detailed_signal">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="after">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_set_data_full"
-              c:identifier="g_object_set_data_full">
+    <function name="signal_connect_data" c:identifier="g_signal_connect_data">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="key">
+        <parameter name="detailed_signal">
           <type name="string" c:type="gchar*"/>
         </parameter>
+        <parameter name="c_handler">
+          <type name="Callback" c:type="GCallback"/>
+        </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="destroy_data">
+          <type name="ClosureNotify" c:type="GClosureNotify"/>
+        </parameter>
+        <parameter name="connect_flags">
+          <type name="ConnectFlags" c:type="GConnectFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_steal_data" c:identifier="g_object_steal_data">
+    <function name="signal_handler_block"
+              c:identifier="g_signal_handler_block">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="handler_id">
+          <type name="ulong" c:type="gulong"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_watch_closure"
-              c:identifier="g_object_watch_closure">
+    <function name="signal_handler_unblock"
+              c:identifier="g_signal_handler_unblock">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="handler_id">
+          <type name="ulong" c:type="gulong"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_new_object" c:identifier="g_cclosure_new_object">
+    <function name="signal_handler_disconnect"
+              c:identifier="g_signal_handler_disconnect">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="callback_func">
-          <type name="GCallback" c:type="GCallback"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="handler_id">
+          <type name="ulong" c:type="gulong"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cclosure_new_object_swap"
-              c:identifier="g_cclosure_new_object_swap">
+    <function name="signal_handler_is_connected"
+              c:identifier="g_signal_handler_is_connected">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="callback_func">
-          <type name="GCallback" c:type="GCallback"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="handler_id">
+          <type name="ulong" c:type="gulong"/>
         </parameter>
       </parameters>
     </function>
-    <function name="closure_new_object" c:identifier="g_closure_new_object">
+    <function name="signal_handler_find" c:identifier="g_signal_handler_find">
       <return-value>
-        <type name="GClosure" c:type="GClosure*"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="sizeof_closure">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="mask">
+          <type name="SignalMatchType" c:type="GSignalMatchType"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_object" c:identifier="g_value_set_object">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="v_object">
+        <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_object" c:identifier="g_value_get_object">
+    <function name="signal_handlers_block_matched"
+              c:identifier="g_signal_handlers_block_matched">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="SignalMatchType" c:type="GSignalMatchType"/>
+        </parameter>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_dup_object" c:identifier="g_value_dup_object">
+    <function name="signal_handlers_unblock_matched"
+              c:identifier="g_signal_handlers_unblock_matched">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="SignalMatchType" c:type="GSignalMatchType"/>
+        </parameter>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_object"
-              c:identifier="g_signal_connect_object">
+    <function name="signal_handlers_disconnect_matched"
+              c:identifier="g_signal_handlers_disconnect_matched">
       <return-value>
-        <type name="ulong" c:type="gulong"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="instance">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="detailed_signal">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="mask">
+          <type name="SignalMatchType" c:type="GSignalMatchType"/>
         </parameter>
-        <parameter name="c_handler">
-          <type name="GCallback" c:type="GCallback"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="gobject">
+        <parameter name="detail">
+          <type name="Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="func">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="connect_flags">
-          <type name="GConnectFlags" c:type="GConnectFlags"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_force_floating"
-              c:identifier="g_object_force_floating">
+    <function name="signal_override_class_closure"
+              c:identifier="g_signal_override_class_closure">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="instance_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="class_closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_run_dispose" c:identifier="g_object_run_dispose">
+    <function name="signal_chain_from_overridden"
+              c:identifier="g_signal_chain_from_overridden">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+        <parameter name="instance_and_params">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_take_object" c:identifier="g_value_take_object">
+    <function name="signal_accumulator_true_handled"
+              c:identifier="g_signal_accumulator_true_handled">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="ihint">
+          <type name="SignalInvocationHint" c:type="GSignalInvocationHint*"/>
+        </parameter>
+        <parameter name="return_accu">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="v_object">
+        <parameter name="handler_return">
+          <type name="Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="dummy">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_object_take_ownership"
-              c:identifier="g_value_set_object_take_ownership">
+    <function name="signal_handlers_destroy"
+              c:identifier="g_signal_handlers_destroy">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signals_destroy" c:identifier="_g_signals_destroy">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="itype">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="v_object">
+      </parameters>
+    </function>
+    <class name="Object"
+           c:type="GObject"
+           glib:type-name="GObject"
+           glib:get-type="intern">
+      <method name="set_property" c:identifier="g_object_set_property">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_property" c:identifier="g_object_get_property">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="freeze_notify" c:identifier="g_object_freeze_notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="notify" c:identifier="g_object_notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="thaw_notify" c:identifier="g_object_thaw_notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="weak_ref" c:identifier="g_object_weak_ref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="WeakNotify" c:type="GWeakNotify"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="weak_unref" c:identifier="g_object_weak_unref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="WeakNotify" c:type="GWeakNotify"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_weak_pointer" c:identifier="g_object_add_weak_pointer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="weak_pointer_location">
+            <type name="pointer" c:type="gpointer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_weak_pointer"
+              c:identifier="g_object_remove_weak_pointer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="weak_pointer_location">
+            <type name="pointer" c:type="gpointer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_toggle_ref" c:identifier="g_object_add_toggle_ref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="ToggleNotify" c:type="GToggleNotify"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_toggle_ref"
+              c:identifier="g_object_remove_toggle_ref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="ToggleNotify" c:type="GToggleNotify"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_qdata" c:identifier="g_object_get_qdata">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="quark">
+            <type name="Quark" c:type="GQuark"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_qdata" c:identifier="g_object_set_qdata">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="quark">
+            <type name="Quark" c:type="GQuark"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_qdata_full" c:identifier="g_object_set_qdata_full">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="quark">
+            <type name="Quark" c:type="GQuark"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="steal_qdata" c:identifier="g_object_steal_qdata">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="quark">
+            <type name="Quark" c:type="GQuark"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_data" c:identifier="g_object_get_data">
+        <return-value>
           <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_compat_control"
-              c:identifier="g_object_compat_control">
-      <return-value>
-        <type name="size" c:type="gsize"/>
-      </return-value>
-      <parameters>
-        <parameter name="what">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="data">
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data" c:identifier="g_object_set_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data_full" c:identifier="g_object_set_data_full">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="steal_data" c:identifier="g_object_steal_data">
+        <return-value>
           <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="ParamSpecChar" c:type="GParamSpecChar"/>
-    <record name="ParamSpecUChar" c:type="GParamSpecUChar"/>
-    <record name="ParamSpecBoolean" c:type="GParamSpecBoolean"/>
-    <record name="ParamSpecInt" c:type="GParamSpecInt"/>
-    <record name="ParamSpecUInt" c:type="GParamSpecUInt"/>
-    <record name="ParamSpecLong" c:type="GParamSpecLong"/>
-    <record name="ParamSpecULong" c:type="GParamSpecULong"/>
-    <record name="ParamSpecInt64" c:type="GParamSpecInt64"/>
-    <record name="ParamSpecUInt64" c:type="GParamSpecUInt64"/>
-    <record name="ParamSpecUnichar" c:type="GParamSpecUnichar"/>
-    <record name="ParamSpecEnum" c:type="GParamSpecEnum"/>
-    <record name="ParamSpecFlags" c:type="GParamSpecFlags"/>
-    <record name="ParamSpecFloat" c:type="GParamSpecFloat"/>
-    <record name="ParamSpecDouble" c:type="GParamSpecDouble"/>
-    <record name="ParamSpecString" c:type="GParamSpecString"/>
-    <record name="ParamSpecParam" c:type="GParamSpecParam"/>
-    <record name="ParamSpecBoxed" c:type="GParamSpecBoxed"/>
-    <record name="ParamSpecPointer" c:type="GParamSpecPointer"/>
-    <record name="ParamSpecValueArray" c:type="GParamSpecValueArray"/>
-    <record name="ParamSpecObject" c:type="GParamSpecObject"/>
-    <record name="ParamSpecOverride" c:type="GParamSpecOverride"/>
-    <record name="ParamSpecGType" c:type="GParamSpecGType"/>
-    <record name="GParamSpecChar" c:type="_GParamSpecChar">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="maximum">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="default_value">
-        <type name="int8" c:type="gint8"/>
-      </field>
-    </record>
-    <record name="GParamSpecUChar" c:type="_GParamSpecUChar">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="uint8" c:type="guint8"/>
-      </field>
-      <field name="maximum">
-        <type name="uint8" c:type="guint8"/>
-      </field>
-      <field name="default_value">
-        <type name="uint8" c:type="guint8"/>
-      </field>
-    </record>
-    <record name="GParamSpecBoolean" c:type="_GParamSpecBoolean">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="default_value">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-    </record>
-    <record name="GParamSpecInt" c:type="_GParamSpecInt">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="maximum">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="default_value">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <record name="GParamSpecUInt" c:type="_GParamSpecUInt">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="maximum">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="default_value">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GParamSpecLong" c:type="_GParamSpecLong">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="long" c:type="glong"/>
-      </field>
-      <field name="maximum">
-        <type name="long" c:type="glong"/>
-      </field>
-      <field name="default_value">
-        <type name="long" c:type="glong"/>
-      </field>
-    </record>
-    <record name="GParamSpecULong" c:type="_GParamSpecULong">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="ulong" c:type="gulong"/>
-      </field>
-      <field name="maximum">
-        <type name="ulong" c:type="gulong"/>
-      </field>
-      <field name="default_value">
-        <type name="ulong" c:type="gulong"/>
-      </field>
-    </record>
-    <record name="GParamSpecInt64" c:type="_GParamSpecInt64">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="gint64" c:type="gint64"/>
-      </field>
-      <field name="maximum">
-        <type name="gint64" c:type="gint64"/>
-      </field>
-      <field name="default_value">
-        <type name="gint64" c:type="gint64"/>
-      </field>
-    </record>
-    <record name="GParamSpecUInt64" c:type="_GParamSpecUInt64">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="guint64" c:type="guint64"/>
-      </field>
-      <field name="maximum">
-        <type name="guint64" c:type="guint64"/>
-      </field>
-      <field name="default_value">
-        <type name="guint64" c:type="guint64"/>
-      </field>
-    </record>
-    <record name="GParamSpecUnichar" c:type="_GParamSpecUnichar">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="default_value">
-        <type name="GLib.gunichar" c:type="gunichar"/>
-      </field>
-    </record>
-    <record name="GParamSpecEnum" c:type="_GParamSpecEnum">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="enum_class">
-        <type name="GEnumClass" c:type="GEnumClass*"/>
-      </field>
-      <field name="default_value">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <record name="GParamSpecFlags" c:type="_GParamSpecFlags">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="flags_class">
-        <type name="GFlagsClass" c:type="GFlagsClass*"/>
-      </field>
-      <field name="default_value">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GParamSpecFloat" c:type="_GParamSpecFloat">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="float" c:type="gfloat"/>
-      </field>
-      <field name="maximum">
-        <type name="float" c:type="gfloat"/>
-      </field>
-      <field name="default_value">
-        <type name="float" c:type="gfloat"/>
-      </field>
-      <field name="epsilon">
-        <type name="float" c:type="gfloat"/>
-      </field>
-    </record>
-    <record name="GParamSpecDouble" c:type="_GParamSpecDouble">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="minimum">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="maximum">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="default_value">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="epsilon">
-        <type name="double" c:type="gdouble"/>
-      </field>
-    </record>
-    <record name="GParamSpecString" c:type="_GParamSpecString">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="default_value">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="cset_first">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="cset_nth">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="substitutor">
-        <type name="GLib.gchar" c:type="gchar"/>
-      </field>
-      <field name="null_fold_if_empty">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="ensure_non_null">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GParamSpecParam" c:type="_GParamSpecParam">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-    </record>
-    <record name="GParamSpecBoxed" c:type="_GParamSpecBoxed">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-    </record>
-    <record name="GParamSpecPointer" c:type="_GParamSpecPointer">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-    </record>
-    <record name="GParamSpecValueArray" c:type="_GParamSpecValueArray">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-      <field name="element_spec">
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </field>
-      <field name="fixed_n_elements">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GParamSpecObject" c:type="_GParamSpecObject">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
-      </field>
-    </record>
-    <record name="GParamSpecOverride" c:type="_GParamSpecOverride">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="watch_closure" c:identifier="g_object_watch_closure">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="closure">
+            <type name="Closure" c:type="GClosure*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="force_floating" c:identifier="g_object_force_floating">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="run_dispose" c:identifier="g_object_run_dispose">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <field name="construct_properties">
+        <type name="GLib.SList" c:type="GSList*"/>
       </field>
-      <field name="overridden">
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+      <callback name="constructor" c:type="constructor">
+        <return-value>
+          <type name="Object" c:type="GObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="type">
+            <type name="Type" c:type="GType"/>
+          </parameter>
+          <parameter name="n_construct_properties">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="construct_properties">
+            <type name="ConstructParam" c:type="GObjectConstructParam*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_property" c:type="set_property">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="property_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_property" c:type="get_property">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="property_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="dispose" c:type="dispose">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="finalize" c:type="finalize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="dispatch_properties_changed"
+                c:type="dispatch_properties_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="n_pspecs">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="pspecs">
+            <type name="ParamSpec" c:type="GParamSpec**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="notify" c:type="notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="pspec">
+            <type name="ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="constructed" c:type="constructed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pdummy">
+        <type name="any" c:type="gpointer"/>
       </field>
-    </record>
-    <record name="GParamSpecGType" c:type="_GParamSpecGType">
-      <field name="parent_instance">
-        <type name="GParamSpec" c:type="GParamSpec"/>
+      <glib:signal name="notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Param" c:type="GParam"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <class name="InitiallyUnowned"
+           c:type="GInitiallyUnowned"
+           parent="Object"
+           glib:type-name="GInitiallyUnowned"
+           glib:get-type="g_initially_unowned_get_type">
+    </class>
+    <record name="ObjectConstructParam" c:type="GObjectConstructParam">
+      <field name="pspec">
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </field>
-      <field name="is_a_type">
-        <type name="GType" c:type="GType"/>
+      <field name="value">
+        <type name="Value" c:type="GValue*"/>
       </field>
     </record>
-    <function name="param_spec_char" c:identifier="g_param_spec_char">
-      <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="minimum">
-          <type name="int8" c:type="gint8"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="int8" c:type="gint8"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="int8" c:type="gint8"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="param_spec_uchar" c:identifier="g_param_spec_uchar">
+    <callback name="GetPropertyFunc" c:type="GObjectGetPropertyFunc">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="minimum">
-          <type name="uint8" c:type="guint8"/>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="maximum">
-          <type name="uint8" c:type="guint8"/>
+        <parameter name="property_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="default_value">
-          <type name="uint8" c:type="guint8"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="param_spec_boolean" c:identifier="g_param_spec_boolean">
+    </callback>
+    <callback name="SetPropertyFunc" c:type="GObjectSetPropertyFunc">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="property_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="default_value">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="value">
+          <type name="Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="param_spec_int" c:identifier="g_param_spec_int">
+    </callback>
+    <callback name="FinalizeFunc" c:type="GObjectFinalizeFunc">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="minimum">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="param_spec_uint" c:identifier="g_param_spec_uint">
+    </callback>
+    <callback name="WeakNotify" c:type="GWeakNotify">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="minimum">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="where_the_object_was">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="param_spec_long" c:identifier="g_param_spec_long">
+    </callback>
+    <function name="object_class_install_property"
+              c:identifier="g_object_class_install_property">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="minimum">
-          <type name="long" c:type="glong"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="long" c:type="glong"/>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="oclass">
+          <type name="Class" c:type="GObjectClass*"/>
         </parameter>
-        <parameter name="default_value">
-          <type name="long" c:type="glong"/>
+        <parameter name="property_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_ulong" c:identifier="g_param_spec_ulong">
+    <function name="object_class_find_property"
+              c:identifier="g_object_class_find_property">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="oclass">
+          <type name="Class" c:type="GObjectClass*"/>
         </parameter>
-        <parameter name="blurb">
+        <parameter name="property_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="minimum">
-          <type name="ulong" c:type="gulong"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="ulong" c:type="gulong"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="ulong" c:type="gulong"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="param_spec_int64" c:identifier="g_param_spec_int64">
+    <function name="object_class_list_properties"
+              c:identifier="g_object_class_list_properties">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="ParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="minimum">
-          <type name="gint64" c:type="gint64"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="gint64" c:type="gint64"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="gint64" c:type="gint64"/>
+        <parameter name="oclass">
+          <type name="Class" c:type="GObjectClass*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="n_properties">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_uint64" c:identifier="g_param_spec_uint64">
+    <function name="object_class_override_property"
+              c:identifier="g_object_class_override_property">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="oclass">
+          <type name="Class" c:type="GObjectClass*"/>
         </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="property_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="blurb">
+        <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="minimum">
-          <type name="guint64" c:type="guint64"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="guint64" c:type="guint64"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="guint64" c:type="guint64"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="param_spec_unichar" c:identifier="g_param_spec_unichar">
+    <function name="object_interface_install_property"
+              c:identifier="g_object_interface_install_property">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="GLib.gunichar" c:type="gunichar"/>
+        <parameter name="g_iface">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="pspec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_enum" c:identifier="g_param_spec_enum">
+    <function name="object_interface_find_property"
+              c:identifier="g_object_interface_find_property">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="g_iface">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="blurb">
+        <parameter name="property_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="enum_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="param_spec_flags" c:identifier="g_param_spec_flags">
+    <function name="object_interface_list_properties"
+              c:identifier="g_object_interface_list_properties">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="ParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="flags_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="g_iface">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="n_properties_p">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_float" c:identifier="g_param_spec_float">
+    <function name="object_new" c:identifier="g_object_new">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="blurb">
+        <parameter name="first_property_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="minimum">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="float" c:type="gfloat"/>
+      </parameters>
+    </function>
+    <function name="object_newv" c:identifier="g_object_newv">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="object_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="default_value">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="n_parameters">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="parameters">
+          <type name="Parameter" c:type="GParameter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_double" c:identifier="g_param_spec_double">
+    <function name="object_set" c:identifier="g_object_set">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="blurb">
+        <parameter name="first_property_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="minimum">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="maximum">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="default_value">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="param_spec_string" c:identifier="g_param_spec_string">
+    <function name="object_get" c:identifier="g_object_get">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="nick">
+        <parameter name="first_property_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="object_connect" c:identifier="g_object_connect">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="default_value">
+        <parameter name="signal_spec">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="param_spec_param" c:identifier="g_param_spec_param">
+    <function name="object_disconnect" c:identifier="g_object_disconnect">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="blurb">
+        <parameter name="signal_spec">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="param_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="param_spec_boxed" c:identifier="g_param_spec_boxed">
+    <function name="object_is_floating" c:identifier="g_object_is_floating">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="object_ref_sink" c:identifier="g_object_ref_sink">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="boxed_type">
-          <type name="GType" c:type="GType"/>
+      </parameters>
+    </function>
+    <function name="object_ref" c:identifier="g_object_ref">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+      </parameters>
+    </function>
+    <function name="object_unref" c:identifier="g_object_unref">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_pointer" c:identifier="g_param_spec_pointer">
+    <callback name="ToggleNotify" c:type="GToggleNotify">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="is_last_ref">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="param_spec_value_array"
-              c:identifier="g_param_spec_value_array">
+    </callback>
+    <function name="cclosure_new_object" c:identifier="g_cclosure_new_object">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="Closure" c:type="GClosure*"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="nick">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="callback_func">
+          <type name="Callback" c:type="GCallback"/>
         </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="element_spec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+      </parameters>
+    </function>
+    <function name="cclosure_new_object_swap"
+              c:identifier="g_cclosure_new_object_swap">
+      <return-value>
+        <type name="Closure" c:type="GClosure*"/>
+      </return-value>
+      <parameters>
+        <parameter name="callback_func">
+          <type name="Callback" c:type="GCallback"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_object" c:identifier="g_param_spec_object">
+    <function name="signal_connect_object"
+              c:identifier="g_signal_connect_object">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="instance">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="nick">
+        <parameter name="detailed_signal">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="blurb">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="c_handler">
+          <type name="Callback" c:type="GCallback"/>
         </parameter>
-        <parameter name="object_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="gobject">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
+        <parameter name="connect_flags">
+          <type name="ConnectFlags" c:type="GConnectFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_override" c:identifier="g_param_spec_override">
+    <function name="object_compat_control"
+              c:identifier="g_object_compat_control">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="size" c:type="gsize"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="what">
+          <type name="size" c:type="gsize"/>
         </parameter>
-        <parameter name="overridden">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="param_spec_gtype" c:identifier="g_param_spec_gtype">
+    <record name="ParamSpecChar" c:type="GParamSpecChar">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="maximum">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="default_value">
+        <type name="int8" c:type="gint8"/>
+      </field>
+    </record>
+    <record name="ParamSpecUChar" c:type="GParamSpecUChar">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+      <field name="maximum">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+      <field name="default_value">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+    </record>
+    <record name="ParamSpecBoolean" c:type="GParamSpecBoolean">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="default_value">
+        <type name="boolean" c:type="gboolean"/>
+      </field>
+    </record>
+    <record name="ParamSpecInt" c:type="GParamSpecInt">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="maximum">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="default_value">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <record name="ParamSpecUInt" c:type="GParamSpecUInt">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="maximum">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="default_value">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="ParamSpecLong" c:type="GParamSpecLong">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="long" c:type="glong"/>
+      </field>
+      <field name="maximum">
+        <type name="long" c:type="glong"/>
+      </field>
+      <field name="default_value">
+        <type name="long" c:type="glong"/>
+      </field>
+    </record>
+    <record name="ParamSpecULong" c:type="GParamSpecULong">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="maximum">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="default_value">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+    </record>
+    <record name="ParamSpecInt64" c:type="GParamSpecInt64">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="int64" c:type="gint64"/>
+      </field>
+      <field name="maximum">
+        <type name="int64" c:type="gint64"/>
+      </field>
+      <field name="default_value">
+        <type name="int64" c:type="gint64"/>
+      </field>
+    </record>
+    <record name="ParamSpecUInt64" c:type="GParamSpecUInt64">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="uint64" c:type="guint64"/>
+      </field>
+      <field name="maximum">
+        <type name="uint64" c:type="guint64"/>
+      </field>
+      <field name="default_value">
+        <type name="uint64" c:type="guint64"/>
+      </field>
+    </record>
+    <record name="ParamSpecUnichar" c:type="GParamSpecUnichar">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="default_value">
+        <type name="unichar" c:type="gunichar"/>
+      </field>
+    </record>
+    <record name="ParamSpecEnum" c:type="GParamSpecEnum">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="enum_class">
+        <type name="EnumClass" c:type="GEnumClass*"/>
+      </field>
+      <field name="default_value">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <record name="ParamSpecFlags" c:type="GParamSpecFlags">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="flags_class">
+        <type name="FlagsClass" c:type="GFlagsClass*"/>
+      </field>
+      <field name="default_value">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="ParamSpecFloat" c:type="GParamSpecFloat">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="float" c:type="gfloat"/>
+      </field>
+      <field name="maximum">
+        <type name="float" c:type="gfloat"/>
+      </field>
+      <field name="default_value">
+        <type name="float" c:type="gfloat"/>
+      </field>
+      <field name="epsilon">
+        <type name="float" c:type="gfloat"/>
+      </field>
+    </record>
+    <record name="ParamSpecDouble" c:type="GParamSpecDouble">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="minimum">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="maximum">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="default_value">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="epsilon">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <record name="ParamSpecString" c:type="GParamSpecString">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="default_value">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="cset_first">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="cset_nth">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="substitutor">
+        <type name="char" c:type="gchar"/>
+      </field>
+      <field name="null_fold_if_empty">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="ensure_non_null">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="ParamSpecParam" c:type="GParamSpecParam">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+    </record>
+    <record name="ParamSpecBoxed" c:type="GParamSpecBoxed">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+    </record>
+    <record name="ParamSpecPointer" c:type="GParamSpecPointer">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+    </record>
+    <record name="ParamSpecValueArray" c:type="GParamSpecValueArray">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="element_spec">
+        <type name="ParamSpec" c:type="GParamSpec*"/>
+      </field>
+      <field name="fixed_n_elements">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="ParamSpecObject" c:type="GParamSpecObject">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+    </record>
+    <record name="ParamSpecOverride" c:type="GParamSpecOverride">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="overridden">
+        <type name="ParamSpec" c:type="GParamSpec*"/>
+      </field>
+    </record>
+    <record name="ParamSpecGType" c:type="GParamSpecGType">
+      <field name="parent_instance">
+        <type name="ParamSpec" c:type="GParamSpec"/>
+      </field>
+      <field name="is_a_type">
+        <type name="Type" c:type="GType"/>
+      </field>
+    </record>
+    <function name="param_spec_char" c:identifier="g_param_spec_char">
       <return-value>
-        <type name="GParamSpec" c:type="GParamSpec*"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5526,780 +5485,840 @@
         <parameter name="blurb">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="is_a_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GParamFlags" c:type="GParamFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="source_set_closure" c:identifier="g_source_set_closure">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="source">
-          <type name="GLib.GSource" c:type="GSource*"/>
+        <parameter name="minimum">
+          <type name="int8" c:type="gint8"/>
         </parameter>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="maximum">
+          <type name="int8" c:type="gint8"/>
         </parameter>
-      </parameters>
-    </function>
-    <bitfield name="GIOCondition"
-              c:type="GIOCondition"
-              glib:type-name="GIOCondition"
-              glib:get-type="g_io_condition_get_type">
-      <member name="in" value="1" c:identifier="G_IO_IN" glib:nick="in"/>
-      <member name="out" value="4" c:identifier="G_IO_OUT" glib:nick="out"/>
-      <member name="pri" value="2" c:identifier="G_IO_PRI" glib:nick="pri"/>
-      <member name="err" value="8" c:identifier="G_IO_ERR" glib:nick="err"/>
-      <member name="hup" value="16" c:identifier="G_IO_HUP" glib:nick="hup"/>
-      <member name="nval"
-              value="32"
-              c:identifier="G_IO_NVAL"
-              glib:nick="nval"/>
-    </bitfield>
-    <record name="TypeModule" c:type="GTypeModule"/>
-    <function name="type_module_use" c:identifier="g_type_module_use">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="module">
-          <type name="GTypeModule" c:type="GTypeModule*"/>
+        <parameter name="default_value">
+          <type name="int8" c:type="gint8"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="type_module_unuse" c:identifier="g_type_module_unuse">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="module">
-          <type name="GTypeModule" c:type="GTypeModule*"/>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="type_module_set_name"
-              c:identifier="g_type_module_set_name">
+    <function name="param_spec_uchar" c:identifier="g_param_spec_uchar">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="module">
-          <type name="GTypeModule" c:type="GTypeModule*"/>
-        </parameter>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="type_module_register_type"
-              c:identifier="g_type_module_register_type">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="module">
-          <type name="GTypeModule" c:type="GTypeModule*"/>
-        </parameter>
-        <parameter name="parent_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="type_name">
+        <parameter name="nick">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="type_info">
-          <type name="GTypeInfo" c:type="GTypeInfo*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GTypeFlags" c:type="GTypeFlags"/>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="type_module_add_interface"
-              c:identifier="g_type_module_add_interface">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="module">
-          <type name="GTypeModule" c:type="GTypeModule*"/>
+        <parameter name="minimum">
+          <type name="uint8" c:type="guint8"/>
         </parameter>
-        <parameter name="instance_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="maximum">
+          <type name="uint8" c:type="guint8"/>
         </parameter>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="default_value">
+          <type name="uint8" c:type="guint8"/>
         </parameter>
-        <parameter name="interface_info">
-          <type name="GInterfaceInfo" c:type="GInterfaceInfo*"/>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="type_module_register_enum"
-              c:identifier="g_type_module_register_enum">
+    <function name="param_spec_boolean" c:identifier="g_param_spec_boolean">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="module">
-          <type name="GTypeModule" c:type="GTypeModule*"/>
-        </parameter>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="const_static_values">
-          <type name="GEnumValue" c:type="GEnumValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_module_register_flags"
-              c:identifier="g_type_module_register_flags">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="module">
-          <type name="GTypeModule" c:type="GTypeModule*"/>
-        </parameter>
-        <parameter name="name">
+        <parameter name="nick">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="const_static_values">
-          <type name="GFlagsValue" c:type="GFlagsValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GTypePluginUse">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GTypePluginUnuse">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GTypePluginCompleteTypeInfo">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-        <parameter name="g_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GTypeInfo" c:type="GTypeInfo*"/>
-        </parameter>
-        <parameter name="value_table">
-          <type name="GTypeValueTable" c:type="GTypeValueTable*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GTypePluginCompleteInterfaceInfo">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-        <parameter name="instance_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GInterfaceInfo" c:type="GInterfaceInfo*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="GTypePlugin"
-               c:type="GTypePlugin"
-               glib:type-name="GTypePlugin"
-               glib:get-type="g_type_plugin_get_type">
-      <field name="use_plugin">
-        <type name="GTypePluginUse" c:type="GTypePluginUse"/>
-      </field>
-      <field name="unuse_plugin">
-        <type name="GTypePluginUnuse" c:type="GTypePluginUnuse"/>
-      </field>
-      <field name="complete_type_info">
-        <type name="GTypePluginCompleteTypeInfo"
-              c:type="GTypePluginCompleteTypeInfo"/>
-      </field>
-      <field name="complete_interface_info">
-        <type name="GTypePluginCompleteInterfaceInfo"
-              c:type="GTypePluginCompleteInterfaceInfo"/>
-      </field>
-    </interface>
-    <function name="type_plugin_use" c:identifier="g_type_plugin_use">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_plugin_unuse" c:identifier="g_type_plugin_unuse">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_plugin_complete_type_info"
-              c:identifier="g_type_plugin_complete_type_info">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-        <parameter name="g_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GTypeInfo" c:type="GTypeInfo*"/>
-        </parameter>
-        <parameter name="value_table">
-          <type name="GTypeValueTable" c:type="GTypeValueTable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="type_plugin_complete_interface_info"
-              c:identifier="g_type_plugin_complete_interface_info">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plugin">
-          <type name="GTypePlugin" c:type="GTypePlugin*"/>
-        </parameter>
-        <parameter name="instance_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="interface_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GInterfaceInfo" c:type="GInterfaceInfo*"/>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <record name="ValueArray" c:type="GValueArray"/>
-    <record name="GValueArray" c:type="_GValueArray">
-      <field name="n_values">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="values">
-        <type name="GValue" c:type="GValue*"/>
-      </field>
-      <field name="n_prealloced">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <function name="value_array_get_nth" c:identifier="g_value_array_get_nth">
-      <return-value>
-        <type name="GValue" c:type="GValue*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="default_value">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-        <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_array_new" c:identifier="g_value_array_new">
+    <function name="param_spec_int" c:identifier="g_param_spec_int">
       <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="n_prealloced">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_array_free" c:identifier="g_value_array_free">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_array_copy" c:identifier="g_value_array_copy">
-      <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_array_prepend" c:identifier="g_value_array_prepend">
-      <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="minimum">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="maximum">
+          <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_array_append" c:identifier="g_value_array_append">
-      <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="default_value">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_array_insert" c:identifier="g_value_array_insert">
+    <function name="param_spec_uint" c:identifier="g_param_spec_uint">
       <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_array_remove" c:identifier="g_value_array_remove">
-      <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="minimum">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="index_">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="maximum">
+          <type name="uint" c:type="guint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_array_sort" c:identifier="g_value_array_sort">
-      <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="default_value">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="compare_func">
-          <type name="GLib.GCompareFunc" c:type="GCompareFunc"/>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_array_sort_with_data"
-              c:identifier="g_value_array_sort_with_data">
+    <function name="param_spec_long" c:identifier="g_param_spec_long">
       <return-value>
-        <type name="GValueArray" c:type="GValueArray*"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value_array">
-          <type name="GValueArray" c:type="GValueArray*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="compare_func">
-          <type name="GLib.GCompareDataFunc" c:type="GCompareDataFunc"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_char" c:identifier="g_value_set_char">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="minimum">
+          <type name="long" c:type="glong"/>
         </parameter>
-        <parameter name="v_char">
-          <type name="GLib.gchar" c:type="gchar"/>
+        <parameter name="maximum">
+          <type name="long" c:type="glong"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_get_char" c:identifier="g_value_get_char">
-      <return-value>
-        <type name="GLib.gchar" c:type="gchar"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="default_value">
+          <type name="long" c:type="glong"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_uchar" c:identifier="g_value_set_uchar">
+    <function name="param_spec_ulong" c:identifier="g_param_spec_ulong">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="v_uchar">
-          <type name="GLib.guchar" c:type="guchar"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_get_uchar" c:identifier="g_value_get_uchar">
-      <return-value>
-        <type name="GLib.guchar" c:type="guchar"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_boolean" c:identifier="g_value_set_boolean">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="minimum">
+          <type name="ulong" c:type="gulong"/>
         </parameter>
-        <parameter name="v_boolean">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="maximum">
+          <type name="ulong" c:type="gulong"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="ulong" c:type="gulong"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_boolean" c:identifier="g_value_get_boolean">
+    <function name="param_spec_int64" c:identifier="g_param_spec_int64">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="minimum">
+          <type name="int64" c:type="gint64"/>
+        </parameter>
+        <parameter name="maximum">
+          <type name="int64" c:type="gint64"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="int64" c:type="gint64"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_int" c:identifier="g_value_set_int">
+    <function name="param_spec_uint64" c:identifier="g_param_spec_uint64">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="minimum">
+          <type name="uint64" c:type="guint64"/>
+        </parameter>
+        <parameter name="maximum">
+          <type name="uint64" c:type="guint64"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="uint64" c:type="guint64"/>
         </parameter>
-        <parameter name="v_int">
-          <type name="int32" c:type="gint"/>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_int" c:identifier="g_value_get_int">
+    <function name="param_spec_unichar" c:identifier="g_param_spec_unichar">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="unichar" c:type="gunichar"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_uint" c:identifier="g_value_set_uint">
+    <function name="param_spec_enum" c:identifier="g_param_spec_enum">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="enum_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="v_uint">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="default_value">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_uint" c:identifier="g_value_get_uint">
+    <function name="param_spec_flags" c:identifier="g_param_spec_flags">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="flags_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_long" c:identifier="g_value_set_long">
+    <function name="param_spec_float" c:identifier="g_param_spec_float">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="v_long">
-          <type name="long" c:type="glong"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="minimum">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="maximum">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_long" c:identifier="g_value_get_long">
+    <function name="param_spec_double" c:identifier="g_param_spec_double">
       <return-value>
-        <type name="long" c:type="glong"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="minimum">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="maximum">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_ulong" c:identifier="g_value_set_ulong">
+    <function name="param_spec_string" c:identifier="g_param_spec_string">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="v_ulong">
-          <type name="ulong" c:type="gulong"/>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="default_value">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_ulong" c:identifier="g_value_get_ulong">
+    <function name="param_spec_param" c:identifier="g_param_spec_param">
       <return-value>
-        <type name="ulong" c:type="gulong"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="param_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_int64" c:identifier="g_value_set_int64">
+    <function name="param_spec_boxed" c:identifier="g_param_spec_boxed">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="boxed_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-        <parameter name="v_int64">
-          <type name="gint64" c:type="gint64"/>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_int64" c:identifier="g_value_get_int64">
+    <function name="param_spec_pointer" c:identifier="g_param_spec_pointer">
       <return-value>
-        <type name="gint64" c:type="gint64"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_uint64" c:identifier="g_value_set_uint64">
+    <function name="param_spec_value_array"
+              c:identifier="g_param_spec_value_array">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="v_uint64">
-          <type name="guint64" c:type="guint64"/>
+        <parameter name="element_spec">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_uint64" c:identifier="g_value_get_uint64">
+    <function name="param_spec_object" c:identifier="g_param_spec_object">
       <return-value>
-        <type name="guint64" c:type="guint64"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="object_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_float" c:identifier="g_value_set_float">
+    <function name="param_spec_override" c:identifier="g_param_spec_override">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="v_float">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="overridden">
+          <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_float" c:identifier="g_value_get_float">
+    <function name="param_spec_gtype" c:identifier="g_param_spec_gtype">
       <return-value>
-        <type name="float" c:type="gfloat"/>
+        <type name="ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="nick">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="blurb">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="is_a_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="ParamFlags" c:type="GParamFlags"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_double" c:identifier="g_value_set_double">
+    <function name="source_set_closure" c:identifier="g_source_set_closure">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="source">
+          <type name="GLib.Source" c:type="GSource*"/>
         </parameter>
-        <parameter name="v_double">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="closure">
+          <type name="Closure" c:type="GClosure*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_double" c:identifier="g_value_get_double">
+    <glib:boxed c:type="IOChannel"
+                glib:name="IOChannel"
+                glib:type-name="GIOChannel"
+                glib:get-type="g_io_channel_get_type">
+    </glib:boxed>
+    <bitfield name="IOCondition"
+              c:type="GIOCondition"
+              glib:type-name="GIOCondition"
+              glib:get-type="g_io_condition_get_type">
+      <member name="in" value="1" c:identifier="G_IO_IN" glib:nick="in"/>
+      <member name="out" value="4" c:identifier="G_IO_OUT" glib:nick="out"/>
+      <member name="pri" value="2" c:identifier="G_IO_PRI" glib:nick="pri"/>
+      <member name="err" value="8" c:identifier="G_IO_ERR" glib:nick="err"/>
+      <member name="hup" value="16" c:identifier="G_IO_HUP" glib:nick="hup"/>
+      <member name="nval"
+              value="32"
+              c:identifier="G_IO_NVAL"
+              glib:nick="nval"/>
+    </bitfield>
+    <class name="TypeModule"
+           c:type="GTypeModule"
+           parent="Object"
+           glib:type-name="GTypeModule"
+           glib:get-type="g_type_module_get_type">
+      <method name="use" c:identifier="g_type_module_use">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unuse" c:identifier="g_type_module_unuse">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_name" c:identifier="g_type_module_set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_type" c:identifier="g_type_module_register_type">
+        <return-value>
+          <type name="Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+          <parameter name="parent_type">
+            <type name="Type" c:type="GType"/>
+          </parameter>
+          <parameter name="type_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="type_info">
+            <type name="TypeInfo" c:type="GTypeInfo*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="TypeFlags" c:type="GTypeFlags"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_interface" c:identifier="g_type_module_add_interface">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+          <parameter name="instance_type">
+            <type name="Type" c:type="GType"/>
+          </parameter>
+          <parameter name="interface_type">
+            <type name="Type" c:type="GType"/>
+          </parameter>
+          <parameter name="interface_info">
+            <type name="InterfaceInfo" c:type="GInterfaceInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_enum" c:identifier="g_type_module_register_enum">
+        <return-value>
+          <type name="Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="const_static_values">
+            <type name="EnumValue" c:type="GEnumValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_flags"
+              c:identifier="g_type_module_register_flags">
+        <return-value>
+          <type name="Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="const_static_values">
+            <type name="FlagsValue" c:type="GFlagsValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="load" c:type="load">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unload" c:type="unload">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="module">
+            <type name="TypeModule" c:type="GTypeModule*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="reserved1" c:type="reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="reserved2" c:type="reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="reserved3" c:type="reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="reserved4" c:type="reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <callback name="TypePluginUse" c:type="GTypePluginUse">
       <return-value>
-        <type name="double" c:type="gdouble"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="value_set_string" c:identifier="g_value_set_string">
+    </callback>
+    <callback name="TypePluginUnuse" c:type="GTypePluginUnuse">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_string">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="value_set_static_string"
-              c:identifier="g_value_set_static_string">
+    </callback>
+    <callback name="TypePluginCompleteTypeInfo"
+              c:type="GTypePluginCompleteTypeInfo">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
         </parameter>
-        <parameter name="v_string">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="g_type">
+          <type name="Type" c:type="GType"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="value_get_string" c:identifier="g_value_get_string">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="info">
+          <type name="TypeInfo" c:type="GTypeInfo*"/>
+        </parameter>
+        <parameter name="value_table">
+          <type name="TypeValueTable" c:type="GTypeValueTable*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="value_dup_string" c:identifier="g_value_dup_string">
+    </callback>
+    <callback name="TypePluginCompleteInterfaceInfo"
+              c:type="GTypePluginCompleteInterfaceInfo">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
+        </parameter>
+        <parameter name="instance_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="interface_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="info">
+          <type name="InterfaceInfo" c:type="GInterfaceInfo*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="value_set_pointer" c:identifier="g_value_set_pointer">
+    </callback>
+    <function name="type_plugin_use" c:identifier="g_type_plugin_use">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_pointer">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_pointer" c:identifier="g_value_get_pointer">
+    <function name="type_plugin_unuse" c:identifier="g_type_plugin_unuse">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_set_gtype" c:identifier="g_value_set_gtype">
+    <function name="type_plugin_complete_type_info"
+              c:identifier="g_type_plugin_complete_type_info">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
+        </parameter>
+        <parameter name="g_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="info">
+          <type name="TypeInfo" c:type="GTypeInfo*"/>
         </parameter>
-        <parameter name="v_gtype">
-          <type name="GType" c:type="GType"/>
+        <parameter name="value_table">
+          <type name="TypeValueTable" c:type="GTypeValueTable*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="value_get_gtype" c:identifier="g_value_get_gtype">
+    <function name="type_plugin_complete_interface_info"
+              c:identifier="g_type_plugin_complete_interface_info">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="plugin">
+          <type name="TypePlugin" c:type="GTypePlugin*"/>
+        </parameter>
+        <parameter name="instance_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="interface_type">
+          <type name="Type" c:type="GType"/>
+        </parameter>
+        <parameter name="info">
+          <type name="InterfaceInfo" c:type="GInterfaceInfo*"/>
         </parameter>
       </parameters>
     </function>
     <function name="pointer_type_register_static"
               c:identifier="g_pointer_type_register_static">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="Type" c:type="GType"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -6314,34 +6333,7 @@
       </return-value>
       <parameters>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_take_string" c:identifier="g_value_take_string">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_string">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_string_take_ownership"
-              c:identifier="g_value_set_string_take_ownership">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="v_string">
-          <type name="string" c:type="gchar*"/>
+          <type name="Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>



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