Regnerate Do not delete Class structures, we need them in gdk/gtk.

2008-08-20  Johan Dahlin  <johan@gnome.org>

    * gir/gio-2.0-good.gir:
    * gir/glib-2.0-good.gir:
    * gir/gobject-2.0-good.gir:
    Regnerate
    * giscanner/glibtransformer.py:
    Do not delete Class structures, we need them in gdk/gtk.
    * tests/scanner/drawable-expected.gir:
    * tests/scanner/foo-expected.gir:
    * tests/scanner/utility-expected.gir:
    Update tests.

svn path=/trunk/; revision=414

diff --git a/ChangeLog b/ChangeLog
index ca89e7c..acb6403 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2008-08-20  Johan Dahlin  <johan@gnome.org>
 
+       * gir/gio-2.0-good.gir:
+       * gir/glib-2.0-good.gir:
+       * gir/gobject-2.0-good.gir:
+       Regnerate
+       * giscanner/glibtransformer.py:
+       Do not delete Class structures, we need them in gdk/gtk.
+       * tests/scanner/drawable-expected.gir:
+       * tests/scanner/foo-expected.gir:
+       * tests/scanner/utility-expected.gir:
+       Update tests.
+
+2008-08-20  Johan Dahlin  <johan@gnome.org>
+
        * tests/scanner/Makefile.am:
        * tests/scanner/annotation-expected.gir:
        * tests/scanner/annotation.c (annotation_object_class_init),

diff --git a/gir/gio-2.0-good.gir b/gir/gio-2.0-good.gir
index fe4b809..8be8d8c 100644 (file)
--- a/gir/gio-2.0-good.gir
+++ b/gir/gio-2.0-good.gir
@@ -31,6 +31,34 @@
         </parameters>
       </callback>
     </interface>
+    <record name="IconIface" c:type="GIconIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="hash" c:type="hash">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon">
+            <type name="Icon" c:type="GIcon*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="equal" c:type="equal">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon1">
+            <type name="Icon" c:type="GIcon*"/>
+          </parameter>
+          <parameter name="icon2">
+            <type name="Icon" c:type="GIcon*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="icon_hash" c:identifier="g_icon_hash">
       <return-value>
         <type name="uint" c:type="guint"/>
@@ -73,7 +101,7 @@
     </bitfield>
     <class name="AppLaunchContext"
            c:type="GAppLaunchContext"
-           parent="Object"
+           parent="GObject.Object"
            glib:type-name="GAppLaunchContext"
            glib:get-type="g_app_launch_context_get_type">
       <constructor name="new" c:identifier="g_app_launch_context_new">
@@ -130,7 +158,7 @@
         </parameters>
       </method>
       <field name="parent_instance">
-        <type name="Object" c:type="GObject"/>
+        <type name="GObject.Object" c:type="GObject"/>
       </field>
       <field name="priv">
         <type name="AppLaunchContextPrivate"
@@ -207,6 +235,81 @@
         </return-value>
       </callback>
     </class>
+    <record name="AppLaunchContextClass" c:type="GAppLaunchContextClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <record name="AppLaunchContextPrivate" c:type="GAppLaunchContextPrivate"/>
     <interface name="AppInfo"
                c:type="GAppInfo"
@@ -431,166 +534,252 @@
         </parameters>
       </callback>
     </interface>
-    <function name="app_info_create_from_commandline"
-              c:identifier="g_app_info_create_from_commandline">
-      <return-value>
-        <type name="AppInfo" c:type="GAppInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="commandline">
+    <record name="AppInfoIface" c:type="GAppInfoIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="dup" c:type="dup">
+        <return-value>
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="equal" c:type="equal">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo1">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="appinfo2">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_id" c:type="get_id">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="application_name">
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_name" c:type="get_name">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="AppInfoCreateFlags" c:type="GAppInfoCreateFlags"/>
-        </parameter>
-        <parameter name="error">
-          <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="AppInfo" c:type="GAppInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_equal" c:identifier="g_app_info_equal">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo1">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-        <parameter name="appinfo2">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_get_id" c:identifier="g_app_info_get_id">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_get_name" c:identifier="g_app_info_get_name">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_get_description"
-              c:identifier="g_app_info_get_description">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_get_executable"
-              c:identifier="g_app_info_get_executable">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <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="Icon" c:type="GIcon*"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_launch" c:identifier="g_app_info_launch">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-        <parameter name="files">
-          <type name="GLib.List" c:type="GList*"/>
-        </parameter>
-        <parameter name="launch_context">
-          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_supports_uris"
-              c:identifier="g_app_info_supports_uris">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_supports_files"
-              c:identifier="g_app_info_supports_files">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="app_info_launch_uris"
-              c:identifier="g_app_info_launch_uris">
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_description" c:type="get_description">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_executable" c:type="get_executable">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_icon" c:type="get_icon">
+        <return-value>
+          <type name="Icon" c:type="GIcon*"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="launch" c:type="launch">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="filenames">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
+          <parameter name="launch_context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="supports_uris" c:type="supports_uris">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="supports_files" c:type="supports_files">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="launch_uris" c:type="launch_uris">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="uris">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
+          <parameter name="launch_context">
+            <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="should_show" c:type="should_show">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="appinfo">
+            <type name="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="content_type">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="extension">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="content_type">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="AppInfo" c:type="GAppInfo*"/>
+          </parameter>
+          <parameter name="content_type">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
+    <function name="app_info_create_from_commandline"
+              c:identifier="g_app_info_create_from_commandline">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="AppInfo" c:type="GAppInfo*"/>
       </return-value>
       <parameters>
-        <parameter name="appinfo">
-          <type name="AppInfo" c:type="GAppInfo*"/>
+        <parameter name="commandline">
+          <type name="string" c:type="char*"/>
         </parameter>
-        <parameter name="uris">
-          <type name="GLib.List" c:type="GList*"/>
+        <parameter name="application_name">
+          <type name="string" c:type="char*"/>
         </parameter>
-        <parameter name="launch_context">
-          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+        <parameter name="flags">
+          <type name="AppInfoCreateFlags" c:type="GAppInfoCreateFlags"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="app_info_should_show"
-              c:identifier="g_app_info_should_show">
+    <function name="app_info_dup" c:identifier="g_app_info_dup">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="AppInfo" c:type="GAppInfo*"/>
       </return-value>
       <parameters>
         <parameter name="appinfo">
@@ -598,61 +787,43 @@
         </parameter>
       </parameters>
     </function>
-    <function name="app_info_set_as_default_for_type"
-              c:identifier="g_app_info_set_as_default_for_type">
+    <function name="app_info_equal" c:identifier="g_app_info_equal">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="appinfo">
+        <parameter name="appinfo1">
           <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
-        <parameter name="content_type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
+        <parameter name="appinfo2">
+          <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="app_info_set_as_default_for_extension"
-              c:identifier="g_app_info_set_as_default_for_extension">
+    <function name="app_info_get_id" c:identifier="g_app_info_get_id">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="appinfo">
           <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
-        <parameter name="extension">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="app_info_add_supports_type"
-              c:identifier="g_app_info_add_supports_type">
+    <function name="app_info_get_name" c:identifier="g_app_info_get_name">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="appinfo">
           <type name="AppInfo" c:type="GAppInfo*"/>
         </parameter>
-        <parameter name="content_type">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="app_info_can_remove_supports_type"
-              c:identifier="g_app_info_can_remove_supports_type">
+    <function name="app_info_get_description"
+              c:identifier="g_app_info_get_description">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="appinfo">
@@ -660,9 +831,164 @@
         </parameter>
       </parameters>
     </function>
-    <function name="app_info_remove_supports_type"
-              c:identifier="g_app_info_remove_supports_type">
-      <return-value>
+    <function name="app_info_get_executable"
+              c:identifier="g_app_info_get_executable">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <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="Icon" c:type="GIcon*"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_launch" c:identifier="g_app_info_launch">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+        <parameter name="files">
+          <type name="GLib.List" c:type="GList*"/>
+        </parameter>
+        <parameter name="launch_context">
+          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_supports_uris"
+              c:identifier="g_app_info_supports_uris">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_supports_files"
+              c:identifier="g_app_info_supports_files">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_launch_uris"
+              c:identifier="g_app_info_launch_uris">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+        <parameter name="uris">
+          <type name="GLib.List" c:type="GList*"/>
+        </parameter>
+        <parameter name="launch_context">
+          <type name="AppLaunchContext" c:type="GAppLaunchContext*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_should_show"
+              c:identifier="g_app_info_should_show">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_set_as_default_for_type"
+              c:identifier="g_app_info_set_as_default_for_type">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+        <parameter name="content_type">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_set_as_default_for_extension"
+              c:identifier="g_app_info_set_as_default_for_extension">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+        <parameter name="extension">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_add_supports_type"
+              c:identifier="g_app_info_add_supports_type">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+        <parameter name="content_type">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_can_remove_supports_type"
+              c:identifier="g_app_info_can_remove_supports_type">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="appinfo">
+          <type name="AppInfo" c:type="GAppInfo*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="app_info_remove_supports_type"
+              c:identifier="g_app_info_remove_supports_type">
+      <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
@@ -751,7 +1077,7 @@
       </callback>
       <callback name="et_source_object" c:type="get_source_object">
         <return-value>
-          <type name="Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
           <parameter name="async_result">
@@ -760,13 +1086,38 @@
         </parameters>
       </callback>
     </interface>
+    <record name="AsyncResultIface" c:type="GAsyncResultIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="et_user_data" c:type="get_user_data">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="async_result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_source_object" c:type="get_source_object">
+        <return-value>
+          <type name="GObject.Object" c:type="GObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="async_result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <callback name="AsyncReadyCallback" c:type="GAsyncReadyCallback">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="source_object">
-          <type name="Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="res">
           <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -790,7 +1141,7 @@
     <function name="async_result_get_source_object"
               c:identifier="g_async_result_get_source_object">
       <return-value>
-        <type name="Object" c:type="GObject*"/>
+        <type name="GObject.Object" c:type="GObject*"/>
       </return-value>
       <parameters>
         <parameter name="res">
@@ -800,7 +1151,7 @@
     </function>
     <function name="io_error_quark" c:identifier="g_io_error_quark">
       <return-value>
-        <type name="Quark" c:type="GQuark"/>
+        <type name="GLib.Quark" c:type="GQuark"/>
       </return-value>
     </function>
     <enumeration name="ErrorEnum"
@@ -944,7 +1295,7 @@
     </function>
     <class name="Cancellable"
            c:type="GCancellable"
-           parent="Object"
+           parent="GObject.Object"
            glib:type-name="GCancellable"
            glib:get-type="g_cancellable_get_type">
       <constructor name="new" c:identifier="g_cancellable_new">
@@ -983,7 +1334,7 @@
       </method>
       <method name="get_fd" c:identifier="g_cancellable_get_fd">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="cancellable">
@@ -1072,14 +1423,54 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="CancellableClass" c:type="GCancellableClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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>
+    </record>
     <class name="InputStream"
            c:type="GInputStream"
-           parent="Object"
+           parent="GObject.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"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1089,7 +1480,7 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1111,10 +1502,10 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_read">
-            <type name="size" c:type="gsize*"/>
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1126,14 +1517,14 @@
       </method>
       <method name="skip" c:identifier="g_input_stream_skip">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" 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"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1171,10 +1562,10 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1189,7 +1580,7 @@
       </method>
       <method name="read_finish" c:identifier="g_input_stream_read_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1212,10 +1603,10 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1230,7 +1621,7 @@
       </method>
       <method name="skip_finish" c:identifier="g_input_stream_skip_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1253,7 +1644,7 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1327,7 +1718,7 @@
       </method>
       <callback name="read_fn" c:type="read_fn">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1337,7 +1728,7 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1349,14 +1740,14 @@
       </callback>
       <callback name="skip" c:type="skip">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" 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"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1394,10 +1785,10 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1412,7 +1803,7 @@
       </callback>
       <callback name="read_finish" c:type="read_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1435,10 +1826,10 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1453,7 +1844,7 @@
       </callback>
       <callback name="skip_finish" c:type="skip_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1476,7 +1867,7 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1531,42 +1922,272 @@
         </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">
+    <record name="InputStreamClass" c:type="GInputStreamClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="read_fn" c:type="read_fn">
         <return-value>
-          <type name="InputStream" c:type="GInputStream*"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="FilterInputStream" c:type="GFilterInputStream*"/>
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size_t" 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="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">
+      <callback name="skip" c:type="skip">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
-      </callback>
-    </class>
+        <parameters>
+          <parameter name="stream">
+            <type name="InputStream" c:type="GInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size_t" 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_t" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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_t" 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_t" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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_t" 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="int" 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>
+    </record>
+    <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="FilterInputStreamClass" c:type="GFilterInputStreamClass">
+      <field name="parent_class">
+        <type name="InputStreamClass" c:type="GInputStreamClass"/>
+      </field>
+      <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>
+    </record>
     <record name="FilterInputStreamPrivate"
             c:type="GFilterInputStreamPrivate"/>
     <class name="BufferedInputStream"
@@ -1577,7 +2198,7 @@
       <method name="get_buffer_size"
               c:identifier="g_buffered_input_stream_get_buffer_size">
         <return-value>
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1595,14 +2216,14 @@
             <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
           </parameter>
           <parameter name="size">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" 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"/>
+          <type name="size_t" c:type="gsize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1612,7 +2233,7 @@
       </method>
       <method name="peek" c:identifier="g_buffered_input_stream_peek">
         <return-value>
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1622,10 +2243,10 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="offset">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
         </parameters>
       </method>
@@ -1639,20 +2260,20 @@
             <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize*"/>
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
       <method name="fill" c:identifier="g_buffered_input_stream_fill">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" 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"/>
+            <type name="ssize_t" c:type="gssize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1672,10 +2293,10 @@
             <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
           </parameter>
           <parameter name="count">
-            <type name="ssize" c:type="gssize"/>
+            <type name="ssize_t" c:type="gssize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1691,7 +2312,7 @@
       <method name="fill_finish"
               c:identifier="g_buffered_input_stream_fill_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1708,7 +2329,7 @@
       <method name="read_byte"
               c:identifier="g_buffered_input_stream_read_byte">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1727,14 +2348,14 @@
       </property>
       <callback name="fill" c:type="fill">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" 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"/>
+            <type name="ssize_t" c:type="gssize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1753,10 +2374,10 @@
             <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
           </parameter>
           <parameter name="count">
-            <type name="ssize" c:type="gssize"/>
+            <type name="ssize_t" c:type="gssize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1771,7 +2392,7 @@
       </callback>
       <callback name="fill_finish" c:type="fill_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1811,40 +2432,130 @@
         </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="InputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="InputStream" 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="InputStream" c:type="GInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="InputStream" c:type="GInputStream*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <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"
+    <record name="BufferedInputStreamClass" c:type="GBufferedInputStreamClass">
+      <field name="parent_class">
+        <type name="FilterInputStreamClass" c:type="GFilterInputStreamClass"/>
+      </field>
+      <callback name="fill" c:type="fill">
+        <return-value>
+          <type name="ssize_t" c:type="gssize"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="BufferedInputStream" c:type="GBufferedInputStream*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="ssize_t" 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_t" c:type="gssize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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_t" 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>
+    </record>
+    <record name="BufferedInputStreamPrivate"
+            c:type="GBufferedInputStreamPrivate"/>
+    <function name="buffered_input_stream_new"
+              c:identifier="g_buffered_input_stream_new">
+      <return-value>
+        <type name="InputStream" c:type="GInputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="base_stream">
+          <type name="InputStream" 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="InputStream" c:type="GInputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="base_stream">
+          <type name="InputStream" c:type="GInputStream*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="size_t" c:type="gsize"/>
+        </parameter>
+      </parameters>
+    </function>
+    <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"
@@ -1857,12 +2568,12 @@
     </bitfield>
     <class name="OutputStream"
            c:type="GOutputStream"
-           parent="Object"
+           parent="GObject.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"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1872,7 +2583,7 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1894,10 +2605,10 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_written">
-            <type name="size" c:type="gsize*"/>
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1909,7 +2620,7 @@
       </method>
       <method name="splice" c:identifier="g_output_stream_splice">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -1974,10 +2685,10 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -1992,7 +2703,7 @@
       </method>
       <method name="write_finish" c:identifier="g_output_stream_write_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -2022,7 +2733,7 @@
                   c:type="GOutputStreamSpliceFlags"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2038,7 +2749,7 @@
       <method name="splice_finish"
               c:identifier="g_output_stream_splice_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -2061,7 +2772,7 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2099,7 +2810,7 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2174,7 +2885,7 @@
       </method>
       <callback name="write_fn" c:type="write_fn">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -2184,7 +2895,7 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2196,7 +2907,7 @@
       </callback>
       <callback name="splice" c:type="splice">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -2261,10 +2972,10 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2279,7 +2990,7 @@
       </callback>
       <callback name="write_finish" c:type="write_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -2309,7 +3020,7 @@
                   c:type="GOutputStreamSpliceFlags"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2324,7 +3035,7 @@
       </callback>
       <callback name="splice_finish" c:type="splice_finish">
         <return-value>
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
@@ -2347,7 +3058,7 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2385,7 +3096,7 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -2455,491 +3166,411 @@
         </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">
+    <record name="OutputStreamClass" c:type="GOutputStreamClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="write_fn" c:type="write_fn">
         <return-value>
-          <type name="OutputStream" c:type="GOutputStream*"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="FilterOutputStream" c:type="GFilterOutputStream*"/>
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size_t" 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="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">
+      <callback name="splice" c:type="splice">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ssize_t" 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="g_reserved3" c:type="_g_reserved3">
+      <callback name="flush" c:type="flush">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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>
-    </class>
-    <record name="FilterOutputStreamPrivate"
-            c:type="GFilterOutputStreamPrivate"/>
-    <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">
+      <callback name="close_fn" c:type="close_fn">
         <return-value>
-          <type name="size" c:type="gsize"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+            <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="set_buffer_size"
-              c:identifier="g_buffered_output_stream_set_buffer_size">
+      </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="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+            <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
-          <parameter name="size">
-            <type name="size" c:type="gsize"/>
+          <parameter name="buffer">
+            <type name="any" c:type="void*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="size_t" c:type="gsize"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="get_auto_grow"
-              c:identifier="g_buffered_output_stream_get_auto_grow">
+      </callback>
+      <callback name="write_finish" c:type="write_finish">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+            <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="set_auto_grow"
-              c:identifier="g_buffered_output_stream_set_auto_grow">
+      </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="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
+            <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
-          <parameter name="auto_grow">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="source">
+            <type name="InputStream" c:type="GInputStream*"/>
           </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="OutputStream" c:type="GOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="OutputStream" 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="OutputStream" c:type="GOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="base_stream">
-          <type name="OutputStream" c:type="GOutputStream*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="size" c:type="gsize"/>
-        </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="Icon" 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="uchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="data_size">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="result_uncertain">
-          <type name="boolean" c:type="gboolean*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="content_types_get_registered"
-              c:identifier="g_content_types_get_registered">
-      <return-value>
-        <type name="GLib.List" c:type="GList*"/>
-      </return-value>
-    </function>
-    <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 name="flags">
+            <type name="OutputStreamSpliceFlags"
+                  c:type="GOutputStreamSpliceFlags"/>
           </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 name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
-          <parameter name="order">
-            <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+          <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>
-      </method>
-      <method name="get_byte_order"
-              c:identifier="g_data_input_stream_get_byte_order">
+      </callback>
+      <callback name="splice_finish" c:type="splice_finish">
         <return-value>
-          <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataInputStream" c:type="GDataInputStream*"/>
+            <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="set_newline_type"
-              c:identifier="g_data_input_stream_set_newline_type">
+      </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="DataInputStream" c:type="GDataInputStream*"/>
+            <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
-          <parameter name="type">
-            <type name="DataStreamNewlineType"
-                  c:type="GDataStreamNewlineType"/>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </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 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_byte" c:identifier="g_data_input_stream_read_byte">
+      </callback>
+      <callback name="flush_finish" c:type="flush_finish">
         <return-value>
-          <type name="uchar" c:type="guchar"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataInputStream" c:type="GDataInputStream*"/>
+            <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
+          <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_int16" c:identifier="g_data_input_stream_read_int16">
+      </callback>
+      <callback name="close_async" c:type="close_async">
         <return-value>
-          <type name="int16" c:type="gint16"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataInputStream" c:type="GDataInputStream*"/>
+            <type name="OutputStream" c:type="GOutputStream*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <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_uint16"
-              c:identifier="g_data_input_stream_read_uint16">
+      </callback>
+      <callback name="close_finish" c:type="close_finish">
         <return-value>
-          <type name="uint16" c:type="guint16"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataInputStream" c:type="GDataInputStream*"/>
+            <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
+          <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_int32" c:identifier="g_data_input_stream_read_int32">
+      </callback>
+      <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
-          <type name="int32" c:type="gint32"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
         <return-value>
-          <type name="uint32" c:type="guint32"/>
+          <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>
+    </record>
+    <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="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**"/>
+            <type name="FilterOutputStream" c:type="GFilterOutputStream*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="read_int64" c:identifier="g_data_input_stream_read_int64">
+      <property name="base-stream">
+        <type name="OutputStream" c:type="GOutputStream"/>
+      </property>
+      <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
-          <type name="int64" c:type="gint64"/>
+          <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="FilterOutputStreamClass" c:type="GFilterOutputStreamClass">
+      <field name="parent_class">
+        <type name="OutputStreamClass" c:type="GOutputStreamClass"/>
+      </field>
+      <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>
+    </record>
+    <record name="FilterOutputStreamPrivate"
+            c:type="GFilterOutputStreamPrivate"/>
+    <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_t" c:type="gsize"/>
         </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**"/>
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="read_uint64"
-              c:identifier="g_data_input_stream_read_uint64">
+      <method name="set_buffer_size"
+              c:identifier="g_buffered_output_stream_set_buffer_size">
         <return-value>
-          <type name="uint64" c:type="guint64"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataInputStream" c:type="GDataInputStream*"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="size">
+            <type name="size_t" c:type="gsize"/>
           </parameter>
         </parameters>
       </method>
-      <method name="read_line" c:identifier="g_data_input_stream_read_line">
+      <method name="get_auto_grow"
+              c:identifier="g_buffered_output_stream_get_auto_grow">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="boolean" c:type="gboolean"/>
         </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**"/>
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="read_until" c:identifier="g_data_input_stream_read_until">
+      <method name="set_auto_grow"
+              c:identifier="g_buffered_output_stream_set_auto_grow">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="none" c:type="void"/>
         </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*"/>
+            <type name="BufferedOutputStream" c:type="GBufferedOutputStream*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="auto_grow">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="byte-order">
-        <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
+      <property name="buffer-size">
+        <type name="uint" c:type="guint"/>
       </property>
-      <property name="newline-type">
-        <type name="DataStreamNewlineType" c:type="GDataStreamNewlineType"/>
+      <property name="auto-grow">
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
@@ -2967,68 +3598,193 @@
         </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">
+    <record name="BufferedOutputStreamClass"
+            c:type="GBufferedOutputStreamClass">
+      <field name="parent_class">
+        <type name="OutputStreamClass" c:type="GOutputStreamClass"/>
+      </field>
+      <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
-          <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
+      </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>
+    </record>
+    <record name="BufferedOutputStreamPrivate"
+            c:type="GBufferedOutputStreamPrivate"/>
+    <function name="buffered_output_stream_new"
+              c:identifier="g_buffered_output_stream_new">
+      <return-value>
+        <type name="OutputStream" c:type="GOutputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="base_stream">
+          <type name="OutputStream" 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="OutputStream" c:type="GOutputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="base_stream">
+          <type name="OutputStream" c:type="GOutputStream*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="size_t" c:type="gsize"/>
+        </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="Icon" 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.uchar" c:type="guchar*"/>
+        </parameter>
+        <parameter name="data_size">
+          <type name="size_t" c:type="gsize"/>
+        </parameter>
+        <parameter name="result_uncertain">
+          <type name="boolean" c:type="gboolean*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="content_types_get_registered"
+              c:identifier="g_content_types_get_registered">
+      <return-value>
+        <type name="GLib.List" c:type="GList*"/>
+      </return-value>
+    </function>
+    <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="OutputStream" c:type="GOutputStream*"/>
+            <type name="InputStream" c:type="GInputStream*"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="set_byte_order"
-              c:identifier="g_data_output_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="DataOutputStream" c:type="GDataOutputStream*"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
           <parameter name="order">
             <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
@@ -3036,45 +3792,49 @@
         </parameters>
       </method>
       <method name="get_byte_order"
-              c:identifier="g_data_output_stream_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="DataOutputStream" c:type="GDataOutputStream*"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="put_byte" c:identifier="g_data_output_stream_put_byte">
+      <method name="set_newline_type"
+              c:identifier="g_data_input_stream_set_newline_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </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*"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="type">
+            <type name="DataStreamNewlineType"
+                  c:type="GDataStreamNewlineType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="put_int16" c:identifier="g_data_output_stream_put_int16">
+      <method name="get_newline_type"
+              c:identifier="g_data_input_stream_get_newline_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="DataStreamNewlineType" c:type="GDataStreamNewlineType"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
-          <parameter name="data">
-            <type name="int16" c:type="gint16"/>
+        </parameters>
+      </method>
+      <method name="read_byte" c:identifier="g_data_input_stream_read_byte">
+        <return-value>
+          <type name="GLib.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*"/>
@@ -3084,16 +3844,13 @@
           </parameter>
         </parameters>
       </method>
-      <method name="put_uint16" c:identifier="g_data_output_stream_put_uint16">
+      <method name="read_int16" c:identifier="g_data_input_stream_read_int16">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int16" c:type="gint16"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="uint16" c:type="guint16"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -3103,16 +3860,14 @@
           </parameter>
         </parameters>
       </method>
-      <method name="put_int32" c:identifier="g_data_output_stream_put_int32">
+      <method name="read_uint16"
+              c:identifier="g_data_input_stream_read_uint16">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="uint16" c:type="guint16"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="int32" c:type="gint32"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -3122,16 +3877,13 @@
           </parameter>
         </parameters>
       </method>
-      <method name="put_uint32" c:identifier="g_data_output_stream_put_uint32">
+      <method name="read_int32" c:identifier="g_data_input_stream_read_int32">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint32"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="uint32" c:type="guint32"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -3141,16 +3893,14 @@
           </parameter>
         </parameters>
       </method>
-      <method name="put_int64" c:identifier="g_data_output_stream_put_int64">
+      <method name="read_uint32"
+              c:identifier="g_data_input_stream_read_uint32">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="uint32" c:type="guint32"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="int64" c:type="gint64"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -3160,16 +3910,13 @@
           </parameter>
         </parameters>
       </method>
-      <method name="put_uint64" c:identifier="g_data_output_stream_put_uint64">
+      <method name="read_int64" c:identifier="g_data_input_stream_read_int64">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int64" c:type="gint64"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="uint64" c:type="guint64"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -3179,16 +3926,55 @@
           </parameter>
         </parameters>
       </method>
-      <method name="put_string" c:identifier="g_data_output_stream_put_string">
+      <method name="read_uint64"
+              c:identifier="g_data_input_stream_read_uint64">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="uint64" c:type="guint64"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
+            <type name="DataInputStream" c:type="GDataInputStream*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="char*"/>
+          <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_t" 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_t" c:type="gsize*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -3201,6 +3987,9 @@
       <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"/>
@@ -3227,432 +4016,516 @@
         </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">
-      <member name="invalid"
-              value="0"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_INVALID"
-              glib:nick="invalid"/>
-      <member name="string"
-              value="1"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_STRING"
-              glib:nick="string"/>
-      <member name="byte-string"
-              value="2"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_BYTE_STRING"
-              glib:nick="byte-string"/>
-      <member name="boolean"
-              value="3"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_BOOLEAN"
-              glib:nick="boolean"/>
-      <member name="uint32"
-              value="4"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_UINT32"
-              glib:nick="uint32"/>
-      <member name="int32"
-              value="5"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_INT32"
-              glib:nick="int32"/>
-      <member name="uint64"
-              value="6"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_UINT64"
-              glib:nick="uint64"/>
-      <member name="int64"
-              value="7"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_INT64"
-              glib:nick="int64"/>
-      <member name="object"
-              value="8"
-              c:identifier="G_FILE_ATTRIBUTE_TYPE_OBJECT"
-              glib:nick="object"/>
-    </enumeration>
-    <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="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_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="FileAttributeInfoList" 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="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="FileAttributeInfoList" 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="FileAttributeInfoList" 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="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="FileAttributeInfoList" 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="FileAttributeInfo" c:type="GFileAttributeInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="FileAttributeInfoList" 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="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="FileAttributeType" c:type="GFileAttributeType"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="FileAttributeInfoFlags"
-                c:type="GFileAttributeInfoFlags"/>
-        </parameter>
-      </parameters>
-    </function>
-    <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">
+    <record name="DataInputStreamClass" c:type="GDataInputStreamClass">
+      <field name="parent_class">
+        <type name="BufferedInputStreamClass"
+              c:type="GBufferedInputStreamClass"/>
+      </field>
+      <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <constructor name="dup" c:identifier="g_file_info_dup">
+      </callback>
+      <callback name="g_reserved2" c:type="_g_reserved2">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+      <callback name="g_reserved3" c:type="_g_reserved3">
         <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">
+      </callback>
+      <callback name="g_reserved4" c:type="_g_reserved4">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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="list_attributes"
-              c:identifier="g_file_info_list_attributes">
+      </callback>
+      <callback name="g_reserved5" c:type="_g_reserved5">
         <return-value>
-          <type name="char" c:type="char**"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+    </record>
+    <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="boolean" c:type="gboolean"/>
+          <type name="DataOutputStream" c:type="GDataOutputStream*"/>
         </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 name="base_stream">
+            <type name="OutputStream" c:type="GOutputStream*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_attribute_type"
-              c:identifier="g_file_info_get_attribute_type">
+      </constructor>
+      <method name="set_byte_order"
+              c:identifier="g_data_output_stream_set_byte_order">
         <return-value>
-          <type name="FileAttributeType" c:type="GFileAttributeType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <parameter name="order">
+            <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_attribute"
-              c:identifier="g_file_info_remove_attribute">
+      <method name="get_byte_order"
+              c:identifier="g_data_output_stream_get_byte_order">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="DataStreamByteOrder" c:type="GDataStreamByteOrder"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
-          </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_attribute_status"
-              c:identifier="g_file_info_get_attribute_status">
+      <method name="put_byte" c:identifier="g_data_output_stream_put_byte">
         <return-value>
-          <type name="FileAttributeStatus" c:type="GFileAttributeStatus"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <parameter name="data">
+            <type name="GLib.uchar" c:type="guchar"/>
           </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="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_attribute_string"
-              c:identifier="g_file_info_get_attribute_string">
+      <method name="put_int16" c:identifier="g_data_output_stream_put_int16">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <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="get_attribute_byte_string"
-              c:identifier="g_file_info_get_attribute_byte_string">
+      <method name="put_uint16" c:identifier="g_data_output_stream_put_uint16">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <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="get_attribute_boolean"
-              c:identifier="g_file_info_get_attribute_boolean">
+      <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="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <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="get_attribute_uint32"
-              c:identifier="g_file_info_get_attribute_uint32">
+      <method name="put_uint32" c:identifier="g_data_output_stream_put_uint32">
         <return-value>
-          <type name="uint32" c:type="guint32"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <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="get_attribute_int32"
-              c:identifier="g_file_info_get_attribute_int32">
+      <method name="put_int64" c:identifier="g_data_output_stream_put_int64">
         <return-value>
-          <type name="int32" c:type="gint32"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <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="get_attribute_uint64"
-              c:identifier="g_file_info_get_attribute_uint64">
+      <method name="put_uint64" c:identifier="g_data_output_stream_put_uint64">
         <return-value>
-          <type name="uint64" c:type="guint64"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="char*"/>
+          <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="get_attribute_int64"
-              c:identifier="g_file_info_get_attribute_int64">
+      <method name="put_string" c:identifier="g_data_output_stream_put_string">
         <return-value>
-          <type name="int64" c:type="gint64"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
+          <parameter name="stream">
+            <type name="DataOutputStream" c:type="GDataOutputStream*"/>
           </parameter>
-          <parameter name="attribute">
+          <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>
-      <method name="get_attribute_object"
-              c:identifier="g_file_info_get_attribute_object">
+      <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="DataOutputStreamClass" c:type="GDataOutputStreamClass">
+      <field name="parent_class">
+        <type name="FilterOutputStreamClass"
+              c:type="GFilterOutputStreamClass"/>
+      </field>
+      <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>
+    </record>
+    <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">
+      <member name="invalid"
+              value="0"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_INVALID"
+              glib:nick="invalid"/>
+      <member name="string"
+              value="1"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_STRING"
+              glib:nick="string"/>
+      <member name="byte-string"
+              value="2"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_BYTE_STRING"
+              glib:nick="byte-string"/>
+      <member name="boolean"
+              value="3"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_BOOLEAN"
+              glib:nick="boolean"/>
+      <member name="uint32"
+              value="4"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_UINT32"
+              glib:nick="uint32"/>
+      <member name="int32"
+              value="5"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_INT32"
+              glib:nick="int32"/>
+      <member name="uint64"
+              value="6"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_UINT64"
+              glib:nick="uint64"/>
+      <member name="int64"
+              value="7"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_INT64"
+              glib:nick="int64"/>
+      <member name="object"
+              value="8"
+              c:identifier="G_FILE_ATTRIBUTE_TYPE_OBJECT"
+              glib:nick="object"/>
+    </enumeration>
+    <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="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_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="FileAttributeInfoList" 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="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" 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="FileAttributeInfoList" 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="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" 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="FileAttributeInfo" c:type="GFileAttributeInfo*"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="FileAttributeInfoList" 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="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="FileAttributeType" c:type="GFileAttributeType"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="FileAttributeInfoFlags"
+                c:type="GFileAttributeInfoFlags"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="FileInfo"
+           c:type="GFileInfo"
+           parent="GObject.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="Object" c:type="GObject*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
+          <parameter name="other">
             <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">
+      </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="info">
+          <parameter name="src_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 name="dest_info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_attribute_string"
-              c:identifier="g_file_info_set_attribute_string">
+      <method name="has_attribute" c:identifier="g_file_info_has_attribute">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="info">
@@ -3661,25 +4534,263 @@
           <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">
+      <method name="list_attributes"
+              c:identifier="g_file_info_list_attributes">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int8" c:type="char**"/>
         </return-value>
         <parameters>
           <parameter name="info">
             <type name="FileInfo" c:type="GFileInfo*"/>
           </parameter>
-          <parameter name="attribute">
+          <parameter name="name_space">
             <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="attr_value">
-            <type name="string" c:type="char*"/>
+        </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="any" 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="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="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="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="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="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="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="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="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="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="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="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="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="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="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>
@@ -3781,7 +4892,7 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="attr_value">
-            <type name="Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </method>
@@ -3889,7 +5000,7 @@
       </method>
       <method name="get_size" c:identifier="g_file_info_get_size">
         <return-value>
-          <type name="offset" c:type="goffset"/>
+          <type name="goffset" c:type="goffset"/>
         </return-value>
         <parameters>
           <parameter name="info">
@@ -4082,7 +5193,7 @@
             <type name="FileInfo" c:type="GFileInfo*"/>
           </parameter>
           <parameter name="size">
-            <type name="offset" c:type="goffset"/>
+            <type name="goffset" c:type="goffset"/>
           </parameter>
         </parameters>
       </method>
@@ -4128,6 +5239,7 @@
         </parameters>
       </method>
     </class>
+    <record name="FileInfoClass" c:type="GFileInfoClass"/>
     <record name="FileAttributeMatcher" c:type="GFileAttributeMatcher"/>
     <enumeration name="FileType"
                  c:type="GFileType"
@@ -4267,7 +5379,7 @@
     </function>
     <class name="FileEnumerator"
            c:type="GFileEnumerator"
-           parent="Object"
+           parent="GObject.Object"
            glib:type-name="GFileEnumerator"
            glib:get-type="g_file_enumerator_get_type">
       <method name="next_file" c:identifier="g_file_enumerator_next_file">
@@ -4312,10 +5424,10 @@
             <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
           <parameter name="num_files">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4354,7 +5466,7 @@
             <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4458,10 +5570,10 @@
             <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
           <parameter name="num_files">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4499,7 +5611,7 @@
             <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4564,22 +5676,17 @@
         </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">
+    <record name="FileEnumeratorClass" c:type="GFileEnumeratorClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="next_file" c:type="next_file">
         <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 name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4588,124 +5695,74 @@
             <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="query_info_async"
-              c:identifier="g_file_input_stream_query_info_async">
+      </callback>
+      <callback name="close_fn" c:type="close_fn">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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 name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </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"/>
-        </return-value>
-        <parameters>
-          <parameter name="stream">
-            <type name="FileInputStream" c:type="GFileInputStream*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="seek" c:type="seek">
+      <callback name="next_files_async" c:type="next_files_async">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="stream">
-            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="offset" c:type="goffset"/>
+          <parameter name="num_files">
+            <type name="int" c:type="int"/>
           </parameter>
-          <parameter name="type">
-            <type name="GLib.SeekType" c:type="GSeekType"/>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <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" c:type="query_info">
+      <callback name="next_files_finish" c:type="next_files_finish">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="stream">
-            <type name="FileInputStream" c:type="GFileInputStream*"/>
-          </parameter>
-          <parameter name="attributes">
-            <type name="string" c:type="char*"/>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
+          <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="query_info_async" c:type="query_info_async">
+      <callback name="close_async" c:type="close_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 name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4718,13 +5775,13 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_info_finish" c:type="query_info_finish">
+      <callback name="close_finish" c:type="close_finish">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="stream">
-            <type name="FileInputStream" c:type="GFileInputStream*"/>
+          <parameter name="enumerator">
+            <type name="FileEnumerator" c:type="GFileEnumerator*"/>
           </parameter>
           <parameter name="res">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -4759,20 +5816,30 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-    </class>
-    <record name="FileInputStreamPrivate" c:type="GFileInputStreamPrivate"/>
-    <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">
+      <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>
+    </record>
+    <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="FileOutputStream" c:type="GFileOutputStream*"/>
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
@@ -4786,19 +5853,19 @@
         </parameters>
       </method>
       <method name="query_info_async"
-              c:identifier="g_file_output_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="FileOutputStream" c:type="GFileOutputStream*"/>
+            <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"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4812,13 +5879,13 @@
         </parameters>
       </method>
       <method name="query_info_finish"
-              c:identifier="g_file_output_stream_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="FileOutputStream" c:type="GFileOutputStream*"/>
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
           <parameter name="result">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -4828,23 +5895,13 @@
           </parameter>
         </parameters>
       </method>
-      <method name="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="FileOutputStream" c:type="GFileOutputStream*"/>
-          </parameter>
-        </parameters>
-      </method>
       <callback name="tell" c:type="tell">
         <return-value>
-          <type name="offset" c:type="goffset"/>
+          <type name="goffset" c:type="goffset"/>
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4854,7 +5911,7 @@
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4864,10 +5921,10 @@
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
           <parameter name="offset">
-            <type name="offset" c:type="goffset"/>
+            <type name="goffset" c:type="goffset"/>
           </parameter>
           <parameter name="type">
             <type name="GLib.SeekType" c:type="GSeekType"/>
@@ -4880,42 +5937,13 @@
           </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*"/>
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
           <parameter name="attributes">
             <type name="string" c:type="char*"/>
@@ -4934,13 +5962,13 @@
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+            <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"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -4959,7 +5987,7 @@
         </return-value>
         <parameters>
           <parameter name="stream">
-            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
           <parameter name="res">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -4969,16 +5997,6 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="et_etag" c:type="get_etag">
-        <return-value>
-          <type name="string" c:type="char*"/>
-        </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"/>
@@ -5005,242 +6023,354 @@
         </return-value>
       </callback>
     </class>
-    <record name="FileOutputStreamPrivate" c:type="GFileOutputStreamPrivate"/>
-    <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">
+    <record name="FileInputStreamClass" c:type="GFileInputStreamClass">
+      <field name="parent_class">
+        <type name="InputStreamClass" c:type="GInputStreamClass"/>
+      </field>
+      <callback name="tell" c:type="tell">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="goffset" c:type="goffset"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_username"
-              c:identifier="g_mount_operation_set_username">
+      </callback>
+      <callback name="can_seek" c:type="can_seek">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
-          </parameter>
-          <parameter name="username">
-            <type name="string" c:type="char*"/>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_password"
-              c:identifier="g_mount_operation_get_password">
+      </callback>
+      <callback name="seek" c:type="seek">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </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 name="offset">
+            <type name="goffset" c:type="goffset"/>
           </parameter>
-          <parameter name="password">
-            <type name="string" c:type="char*"/>
+          <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>
-      </method>
-      <method name="get_anonymous"
-              c:identifier="g_mount_operation_get_anonymous">
+      </callback>
+      <callback name="query_info" c:type="query_info">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <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="set_anonymous"
-              c:identifier="g_mount_operation_set_anonymous">
+      </callback>
+      <callback name="query_info_async" c:type="query_info_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileInputStream" c:type="GFileInputStream*"/>
           </parameter>
-          <parameter name="anonymous">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="get_domain" c:identifier="g_mount_operation_get_domain">
+      </callback>
+      <callback name="query_info_finish" c:type="query_info_finish">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <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>
-      </method>
-      <method name="set_domain" c:identifier="g_mount_operation_set_domain">
+      </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>
+    </record>
+    <record name="FileInputStreamPrivate" c:type="GFileInputStreamPrivate"/>
+    <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="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
-          <parameter name="domain">
+          <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="get_password_save"
-              c:identifier="g_mount_operation_get_password_save">
+      <method name="query_info_async"
+              c:identifier="g_file_output_stream_query_info_async">
         <return-value>
-          <type name="PasswordSave" c:type="GPasswordSave"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <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="int" 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="set_password_save"
-              c:identifier="g_mount_operation_set_password_save">
+      <method name="query_info_finish"
+              c:identifier="g_file_output_stream_query_info_finish">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
-          <parameter name="save">
-            <type name="PasswordSave" c:type="GPasswordSave"/>
+          <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_choice" c:identifier="g_mount_operation_get_choice">
+      <method name="get_etag" c:identifier="g_file_output_stream_get_etag">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_choice" c:identifier="g_mount_operation_set_choice">
+      <callback name="tell" c:type="tell">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="goffset" c:type="goffset"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
-          </parameter>
-          <parameter name="choice">
-            <type name="int32" c:type="int"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="reply" c:identifier="g_mount_operation_reply">
+      </callback>
+      <callback name="can_seek" c:type="can_seek">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
-          </parameter>
-          <parameter name="result">
-            <type name="MountOperationResult" c:type="GMountOperationResult"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </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">
+      </callback>
+      <callback name="seek" c:type="seek">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
-          <parameter name="message">
-            <type name="string" c:type="char*"/>
+          <parameter name="offset">
+            <type name="goffset" c:type="goffset"/>
           </parameter>
-          <parameter name="default_user">
-            <type name="string" c:type="char*"/>
+          <parameter name="type">
+            <type name="GLib.SeekType" c:type="GSeekType"/>
           </parameter>
-          <parameter name="default_domain">
-            <type name="string" c:type="char*"/>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="AskPasswordFlags" c:type="GAskPasswordFlags"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="ask_question" c:type="ask_question">
+      <callback name="can_truncate" c:type="can_truncate">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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 name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="reply" c:type="reply">
+      <callback name="truncate_fn" c:type="truncate_fn">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
-          <parameter name="result">
-            <type name="MountOperationResult" c:type="GMountOperationResult"/>
+          <parameter name="size">
+            <type name="goffset" 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="int" 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*"/>
+        </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5269,1003 +6399,975 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="g_reserved6" c:type="_g_reserved6">
+    </class>
+    <record name="FileOutputStreamClass" c:type="GFileOutputStreamClass">
+      <field name="parent_class">
+        <type name="OutputStreamClass" c:type="GOutputStreamClass"/>
+      </field>
+      <callback name="tell" c:type="tell">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="goffset" c:type="goffset"/>
         </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="g_reserved7" c:type="_g_reserved7">
+      <callback name="can_seek" c:type="can_seek">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="g_reserved8" c:type="_g_reserved8">
+      <callback name="seek" c:type="seek">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="goffset" 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="g_reserved9" c:type="_g_reserved9">
+      <callback name="can_truncate" c:type="can_truncate">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="g_reserved10" c:type="_g_reserved10">
+      <callback name="truncate_fn" c:type="truncate_fn">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="goffset" 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="g_reserved11" c:type="_g_reserved11">
+      <callback name="query_info" c:type="query_info">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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="g_reserved12" c:type="_g_reserved12">
+      <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="int" 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>
-      <glib:signal name="ask-password">
+      <callback name="query_info_finish" c:type="query_info_finish">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
-          <parameter name="p2">
-            <type name="AskPasswordFlags" c:type="GAskPasswordFlags"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="ask-question">
+      </callback>
+      <callback name="et_etag" c:type="get_etag">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="Strv" c:type="GStrv"/>
+          <parameter name="stream">
+            <type name="FileOutputStream" c:type="GFileOutputStream*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="reply">
+      </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>
+    </record>
+    <record name="FileOutputStreamPrivate" c:type="GFileOutputStreamPrivate"/>
+    <class name="MountOperation"
+           c:type="GMountOperation"
+           parent="GObject.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*"/>
+        </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="MountOperationResult" c:type="GMountOperationResult"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <record name="MountOperationPrivate" c:type="GMountOperationPrivate"/>
-    <bitfield name="AskPasswordFlags"
-              c:type="GAskPasswordFlags"
-              glib:type-name="GAskPasswordFlags"
-              glib:get-type="g_ask_password_flags_get_type">
-      <member name="need-password"
-              value="1"
-              c:identifier="G_ASK_PASSWORD_NEED_PASSWORD"
-              glib:nick="need-password"/>
-      <member name="need-username"
-              value="2"
-              c:identifier="G_ASK_PASSWORD_NEED_USERNAME"
-              glib:nick="need-username"/>
-      <member name="need-domain"
-              value="4"
-              c:identifier="G_ASK_PASSWORD_NEED_DOMAIN"
-              glib:nick="need-domain"/>
-      <member name="saving-supported"
-              value="8"
-              c:identifier="G_ASK_PASSWORD_SAVING_SUPPORTED"
-              glib:nick="saving-supported"/>
-      <member name="anonymous-supported"
-              value="16"
-              c:identifier="G_ASK_PASSWORD_ANONYMOUS_SUPPORTED"
-              glib:nick="anonymous-supported"/>
-    </bitfield>
-    <enumeration name="PasswordSave"
-                 c:type="GPasswordSave"
-                 glib:type-name="GPasswordSave"
-                 glib:get-type="g_password_save_get_type">
-      <member name="never"
-              value="0"
-              c:identifier="G_PASSWORD_SAVE_NEVER"
-              glib:nick="never"/>
-      <member name="for-session"
-              value="1"
-              c:identifier="G_PASSWORD_SAVE_FOR_SESSION"
-              glib:nick="for-session"/>
-      <member name="permanently"
-              value="2"
-              c:identifier="G_PASSWORD_SAVE_PERMANENTLY"
-              glib:nick="permanently"/>
-    </enumeration>
-    <enumeration name="MountOperationResult"
-                 c:type="GMountOperationResult"
-                 glib:type-name="GMountOperationResult"
-                 glib:get-type="g_mount_operation_result_get_type">
-      <member name="handled"
-              value="0"
-              c:identifier="G_MOUNT_OPERATION_HANDLED"
-              glib:nick="handled"/>
-      <member name="aborted"
-              value="1"
-              c:identifier="G_MOUNT_OPERATION_ABORTED"
-              glib:nick="aborted"/>
-      <member name="unhandled"
-              value="2"
-              c:identifier="G_MOUNT_OPERATION_UNHANDLED"
-              glib:nick="unhandled"/>
-    </enumeration>
-    <bitfield name="FileQueryInfoFlags"
-              c:type="GFileQueryInfoFlags"
-              glib:type-name="GFileQueryInfoFlags"
-              glib:get-type="g_file_query_info_flags_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="G_FILE_QUERY_INFO_NONE"
-              glib:nick="none"/>
-      <member name="nofollow-symlinks"
-              value="1"
-              c:identifier="G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS"
-              glib:nick="nofollow-symlinks"/>
-    </bitfield>
-    <bitfield name="FileCreateFlags"
-              c:type="GFileCreateFlags"
-              glib:type-name="GFileCreateFlags"
-              glib:get-type="g_file_create_flags_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="G_FILE_CREATE_NONE"
-              glib:nick="none"/>
-      <member name="private"
-              value="1"
-              c:identifier="G_FILE_CREATE_PRIVATE"
-              glib:nick="private"/>
-    </bitfield>
-    <enumeration name="MountMountFlags"
-                 c:type="GMountMountFlags"
-                 glib:type-name="GMountMountFlags"
-                 glib:get-type="g_mount_mount_flags_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="G_MOUNT_MOUNT_NONE"
-              glib:nick="none"/>
-    </enumeration>
-    <bitfield name="MountUnmountFlags"
-              c:type="GMountUnmountFlags"
-              glib:type-name="GMountUnmountFlags"
-              glib:get-type="g_mount_unmount_flags_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="G_MOUNT_UNMOUNT_NONE"
-              glib:nick="none"/>
-      <member name="force"
-              value="1"
-              c:identifier="G_MOUNT_UNMOUNT_FORCE"
-              glib:nick="force"/>
-    </bitfield>
-    <bitfield name="FileCopyFlags"
-              c:type="GFileCopyFlags"
-              glib:type-name="GFileCopyFlags"
-              glib:get-type="g_file_copy_flags_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="G_FILE_COPY_NONE"
-              glib:nick="none"/>
-      <member name="overwrite"
-              value="1"
-              c:identifier="G_FILE_COPY_OVERWRITE"
-              glib:nick="overwrite"/>
-      <member name="backup"
-              value="2"
-              c:identifier="G_FILE_COPY_BACKUP"
-              glib:nick="backup"/>
-      <member name="nofollow-symlinks"
-              value="4"
-              c:identifier="G_FILE_COPY_NOFOLLOW_SYMLINKS"
-              glib:nick="nofollow-symlinks"/>
-      <member name="all-metadata"
-              value="8"
-              c:identifier="G_FILE_COPY_ALL_METADATA"
-              glib:nick="all-metadata"/>
-      <member name="no-fallback-for-move"
-              value="16"
-              c:identifier="G_FILE_COPY_NO_FALLBACK_FOR_MOVE"
-              glib:nick="no-fallback-for-move"/>
-    </bitfield>
-    <bitfield name="FileMonitorFlags"
-              c:type="GFileMonitorFlags"
-              glib:type-name="GFileMonitorFlags"
-              glib:get-type="g_file_monitor_flags_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="G_FILE_MONITOR_NONE"
-              glib:nick="none"/>
-      <member name="watch-mounts"
-              value="1"
-              c:identifier="G_FILE_MONITOR_WATCH_MOUNTS"
-              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" c:type="dup">
+      </method>
+      <method name="set_username"
+              c:identifier="g_mount_operation_set_username">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="username">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="hash" c:type="hash">
+      </method>
+      <method name="get_password"
+              c:identifier="g_mount_operation_get_password">
         <return-value>
-          <type name="uint" c:type="guint"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="equal" c:type="equal">
+      </method>
+      <method name="set_password"
+              c:identifier="g_mount_operation_set_password">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file1">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="file2">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="password">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="is_native" c:type="is_native">
+      </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="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="has_uri_scheme" c:type="has_uri_scheme">
+      </method>
+      <method name="set_anonymous"
+              c:identifier="g_mount_operation_set_anonymous">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="uri_scheme">
-            <type name="string" c:type="char*"/>
+          <parameter name="anonymous">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="et_uri_scheme" c:type="get_uri_scheme">
+      </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="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="et_basename" c:type="get_basename">
+      </method>
+      <method name="set_domain" c:identifier="g_mount_operation_set_domain">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
+          </parameter>
+          <parameter name="domain">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="et_path" c:type="get_path">
+      </method>
+      <method name="get_password_save"
+              c:identifier="g_mount_operation_get_password_save">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="PasswordSave" c:type="GPasswordSave"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="et_uri" c:type="get_uri">
+      </method>
+      <method name="set_password_save"
+              c:identifier="g_mount_operation_set_password_save">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <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="File" c:type="GFile*"/>
+          <parameter name="save">
+            <type name="PasswordSave" c:type="GPasswordSave"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="et_parent" c:type="get_parent">
+      </method>
+      <method name="get_choice" c:identifier="g_mount_operation_get_choice">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="prefix_matches" c:type="prefix_matches">
+      </method>
+      <method name="set_choice" c:identifier="g_mount_operation_set_choice">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="prefix">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="choice">
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="et_relative_path" c:type="get_relative_path">
+      </method>
+      <method name="reply" c:identifier="g_mount_operation_reply">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="parent">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="descendant">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="result">
+            <type name="MountOperationResult" c:type="GMountOperationResult"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="resolve_relative_path" c:type="resolve_relative_path">
+      </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="File" c:type="GFile*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="relative_path">
+          <parameter name="message">
             <type name="string" c:type="char*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="et_child_for_display_name"
-                c:type="get_child_for_display_name">
-        <return-value>
-          <type name="File" c:type="GFile*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="default_user">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="display_name">
+          <parameter name="default_domain">
             <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="flags">
+            <type name="AskPasswordFlags" c:type="GAskPasswordFlags"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="enumerate_children" c:type="enumerate_children">
+      <callback name="ask_question" c:type="ask_question">
         <return-value>
-          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="attributes">
+          <parameter name="message">
             <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="choices">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="enumerate_children_async"
-                c:type="enumerate_children_async">
+      <callback name="reply" c:type="reply">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="attributes">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
-          </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 name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="result">
+            <type name="MountOperationResult" c:type="GMountOperationResult"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="enumerate_children_finish"
-                c:type="enumerate_children_finish">
+      <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
-          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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="query_info" c:type="query_info">
+      <callback name="g_reserved2" c:type="_g_reserved2">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="attributes">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
-          </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">
+      <callback name="g_reserved3" c:type="_g_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="attributes">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
-          </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">
+      <callback name="g_reserved4" c:type="_g_reserved4">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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="query_filesystem_info" c:type="query_filesystem_info">
+      <callback name="g_reserved5" c:type="_g_reserved5">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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_filesystem_info_async"
-                c:type="query_filesystem_info_async">
+      <callback name="g_reserved6" c:type="_g_reserved6">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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_filesystem_info_finish"
-                c:type="query_filesystem_info_finish">
+      <callback name="g_reserved7" c:type="_g_reserved7">
         <return-value>
-          <type name="FileInfo" c:type="GFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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="find_enclosing_mount" c:type="find_enclosing_mount">
+      <callback name="g_reserved8" c:type="_g_reserved8">
         <return-value>
-          <type name="Mount" c:type="GMount*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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="find_enclosing_mount_async"
-                c:type="find_enclosing_mount_async">
+      <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="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="callback">
-            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <parameter name="p1">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="p2">
+            <type name="AskPasswordFlags" c:type="GAskPasswordFlags"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="find_enclosing_mount_finish"
-                c:type="find_enclosing_mount_finish">
+      </glib:signal>
+      <glib:signal name="ask-question">
         <return-value>
-          <type name="Mount" c:type="GMount*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="res">
-            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="p0">
+            <type name="GObject.Strv" c:type="GStrv"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_display_name" c:type="set_display_name">
+      </glib:signal>
+      <glib:signal name="reply">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="display_name">
-            <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 name="object">
+            <type name="MountOperationResult" c:type="GMountOperationResult"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_display_name_async" c:type="set_display_name_async">
+      </glib:signal>
+    </class>
+    <record name="MountOperationClass" c:type="GMountOperationClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="ask_password" c:type="ask_password">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="display_name">
+          <parameter name="message">
             <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 name="default_user">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <parameter name="default_domain">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="flags">
+            <type name="AskPasswordFlags" c:type="GAskPasswordFlags"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_display_name_finish"
-                c:type="set_display_name_finish">
+      <callback name="ask_question" c:type="ask_question">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="res">
-            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          <parameter name="message">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="choices">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_settable_attributes"
-                c:type="query_settable_attributes">
+      <callback name="reply" c:type="reply">
         <return-value>
-          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GMountOperation*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="result">
+            <type name="MountOperationResult" c:type="GMountOperationResult"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="query_settable_attributes_async"
-                c:type="_query_settable_attributes_async">
+      <callback name="g_reserved1" c:type="_g_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="query_settable_attributes_finish"
-                c:type="_query_settable_attributes_finish">
+      <callback name="g_reserved2" c:type="_g_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="query_writable_namespaces"
-                c:type="query_writable_namespaces">
+      <callback name="g_reserved3" c:type="_g_reserved3">
         <return-value>
-          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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_writable_namespaces_async"
-                c:type="_query_writable_namespaces_async">
+      <callback name="g_reserved4" c:type="_g_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="query_writable_namespaces_finish"
-                c:type="_query_writable_namespaces_finish">
+      <callback name="g_reserved5" c:type="_g_reserved5">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="set_attribute" c:type="set_attribute">
+      <callback name="g_reserved6" c:type="_g_reserved6">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </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>
-          <parameter name="flags">
-            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
-          </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="set_attributes_from_info"
-                c:type="set_attributes_from_info">
+      <callback name="g_reserved7" c:type="_g_reserved7">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
-          </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="set_attributes_async" c:type="set_attributes_async">
+      <callback name="g_reserved8" c:type="_g_reserved8">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
-          </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="set_attributes_finish" c:type="set_attributes_finish">
+      <callback name="g_reserved9" c:type="_g_reserved9">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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>
+    </record>
+    <record name="MountOperationPrivate" c:type="GMountOperationPrivate"/>
+    <bitfield name="AskPasswordFlags"
+              c:type="GAskPasswordFlags"
+              glib:type-name="GAskPasswordFlags"
+              glib:get-type="g_ask_password_flags_get_type">
+      <member name="need-password"
+              value="1"
+              c:identifier="G_ASK_PASSWORD_NEED_PASSWORD"
+              glib:nick="need-password"/>
+      <member name="need-username"
+              value="2"
+              c:identifier="G_ASK_PASSWORD_NEED_USERNAME"
+              glib:nick="need-username"/>
+      <member name="need-domain"
+              value="4"
+              c:identifier="G_ASK_PASSWORD_NEED_DOMAIN"
+              glib:nick="need-domain"/>
+      <member name="saving-supported"
+              value="8"
+              c:identifier="G_ASK_PASSWORD_SAVING_SUPPORTED"
+              glib:nick="saving-supported"/>
+      <member name="anonymous-supported"
+              value="16"
+              c:identifier="G_ASK_PASSWORD_ANONYMOUS_SUPPORTED"
+              glib:nick="anonymous-supported"/>
+    </bitfield>
+    <enumeration name="PasswordSave"
+                 c:type="GPasswordSave"
+                 glib:type-name="GPasswordSave"
+                 glib:get-type="g_password_save_get_type">
+      <member name="never"
+              value="0"
+              c:identifier="G_PASSWORD_SAVE_NEVER"
+              glib:nick="never"/>
+      <member name="for-session"
+              value="1"
+              c:identifier="G_PASSWORD_SAVE_FOR_SESSION"
+              glib:nick="for-session"/>
+      <member name="permanently"
+              value="2"
+              c:identifier="G_PASSWORD_SAVE_PERMANENTLY"
+              glib:nick="permanently"/>
+    </enumeration>
+    <enumeration name="MountOperationResult"
+                 c:type="GMountOperationResult"
+                 glib:type-name="GMountOperationResult"
+                 glib:get-type="g_mount_operation_result_get_type">
+      <member name="handled"
+              value="0"
+              c:identifier="G_MOUNT_OPERATION_HANDLED"
+              glib:nick="handled"/>
+      <member name="aborted"
+              value="1"
+              c:identifier="G_MOUNT_OPERATION_ABORTED"
+              glib:nick="aborted"/>
+      <member name="unhandled"
+              value="2"
+              c:identifier="G_MOUNT_OPERATION_UNHANDLED"
+              glib:nick="unhandled"/>
+    </enumeration>
+    <bitfield name="FileQueryInfoFlags"
+              c:type="GFileQueryInfoFlags"
+              glib:type-name="GFileQueryInfoFlags"
+              glib:get-type="g_file_query_info_flags_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="G_FILE_QUERY_INFO_NONE"
+              glib:nick="none"/>
+      <member name="nofollow-symlinks"
+              value="1"
+              c:identifier="G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS"
+              glib:nick="nofollow-symlinks"/>
+    </bitfield>
+    <bitfield name="FileCreateFlags"
+              c:type="GFileCreateFlags"
+              glib:type-name="GFileCreateFlags"
+              glib:get-type="g_file_create_flags_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="G_FILE_CREATE_NONE"
+              glib:nick="none"/>
+      <member name="private"
+              value="1"
+              c:identifier="G_FILE_CREATE_PRIVATE"
+              glib:nick="private"/>
+    </bitfield>
+    <enumeration name="MountMountFlags"
+                 c:type="GMountMountFlags"
+                 glib:type-name="GMountMountFlags"
+                 glib:get-type="g_mount_mount_flags_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="G_MOUNT_MOUNT_NONE"
+              glib:nick="none"/>
+    </enumeration>
+    <bitfield name="MountUnmountFlags"
+              c:type="GMountUnmountFlags"
+              glib:type-name="GMountUnmountFlags"
+              glib:get-type="g_mount_unmount_flags_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="G_MOUNT_UNMOUNT_NONE"
+              glib:nick="none"/>
+      <member name="force"
+              value="1"
+              c:identifier="G_MOUNT_UNMOUNT_FORCE"
+              glib:nick="force"/>
+    </bitfield>
+    <bitfield name="FileCopyFlags"
+              c:type="GFileCopyFlags"
+              glib:type-name="GFileCopyFlags"
+              glib:get-type="g_file_copy_flags_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="G_FILE_COPY_NONE"
+              glib:nick="none"/>
+      <member name="overwrite"
+              value="1"
+              c:identifier="G_FILE_COPY_OVERWRITE"
+              glib:nick="overwrite"/>
+      <member name="backup"
+              value="2"
+              c:identifier="G_FILE_COPY_BACKUP"
+              glib:nick="backup"/>
+      <member name="nofollow-symlinks"
+              value="4"
+              c:identifier="G_FILE_COPY_NOFOLLOW_SYMLINKS"
+              glib:nick="nofollow-symlinks"/>
+      <member name="all-metadata"
+              value="8"
+              c:identifier="G_FILE_COPY_ALL_METADATA"
+              glib:nick="all-metadata"/>
+      <member name="no-fallback-for-move"
+              value="16"
+              c:identifier="G_FILE_COPY_NO_FALLBACK_FOR_MOVE"
+              glib:nick="no-fallback-for-move"/>
+    </bitfield>
+    <bitfield name="FileMonitorFlags"
+              c:type="GFileMonitorFlags"
+              glib:type-name="GFileMonitorFlags"
+              glib:get-type="g_file_monitor_flags_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="G_FILE_MONITOR_NONE"
+              glib:nick="none"/>
+      <member name="watch-mounts"
+              value="1"
+              c:identifier="G_FILE_MONITOR_WATCH_MOUNTS"
+              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" c:type="dup">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="result">
-            <type name="AsyncResult" c:type="GAsyncResult*"/>
-          </parameter>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GFileInfo**"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
-          </parameter>
         </parameters>
       </callback>
-      <callback name="read_fn" c:type="read_fn">
+      <callback name="hash" c:type="hash">
         <return-value>
-          <type name="FileInputStream" c:type="GFileInputStream*"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </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">
+      <callback name="equal" c:type="equal">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="file">
+          <parameter name="file1">
             <type name="File" c:type="GFile*"/>
           </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 name="file2">
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="read_finish" c:type="read_finish">
+      <callback name="is_native" c:type="is_native">
         <return-value>
-          <type name="FileInputStream" c:type="GFileInputStream*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </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="append_to" c:type="append_to">
+      <callback name="has_uri_scheme" c:type="has_uri_scheme">
         <return-value>
-          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="uri_scheme">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="append_to_async" c:type="append_to_async">
+      <callback name="et_uri_scheme" c:type="get_uri_scheme">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+        </parameters>
+      </callback>
+      <callback name="et_basename" c:type="get_basename">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+        </parameters>
+      </callback>
+      <callback name="et_path" c:type="get_path">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
+        </parameters>
+      </callback>
+      <callback name="et_uri" c:type="get_uri">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+        </parameters>
+      </callback>
+      <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="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </callback>
+      <callback name="et_parent" c:type="get_parent">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="append_to_finish" c:type="append_to_finish">
+      <callback name="prefix_matches" c:type="prefix_matches">
         <return-value>
-          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="prefix">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="descendant">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="resolve_relative_path" c:type="resolve_relative_path">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="res">
-            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          <parameter name="relative_path">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_child_for_display_name"
+                c:type="get_child_for_display_name">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="display_name">
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="error">
             <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="create" c:type="create">
+      <callback name="enumerate_children" c:type="enumerate_children">
         <return-value>
-          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
           <parameter name="flags">
-            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6275,7 +7377,8 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="create_async" c:type="create_async">
+      <callback name="enumerate_children_async"
+                c:type="enumerate_children_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6283,11 +7386,14 @@
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
           <parameter name="flags">
-            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6300,9 +7406,10 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="create_finish" c:type="create_finish">
+      <callback name="enumerate_children_finish"
+                c:type="enumerate_children_finish">
         <return-value>
-          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
         </return-value>
         <parameters>
           <parameter name="file">
@@ -6316,22 +7423,19 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="replace" c:type="replace">
+      <callback name="query_info" c:type="query_info">
         <return-value>
-          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="etag">
+          <parameter name="attributes">
             <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="make_backup">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
           <parameter name="flags">
-            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6341,7 +7445,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="replace_async" c:type="replace_async">
+      <callback name="query_info_async" c:type="query_info_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6349,17 +7453,14 @@
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="etag">
+          <parameter name="attributes">
             <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="make_backup">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
           <parameter name="flags">
-            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6372,9 +7473,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="replace_finish" c:type="replace_finish">
+      <callback name="query_info_finish" c:type="query_info_finish">
         <return-value>
-          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="file">
@@ -6388,14 +7489,17 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_file" c:type="delete_file">
+      <callback name="query_filesystem_info" c:type="query_filesystem_info">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
@@ -6404,45 +7508,52 @@
           </parameter>
         </parameters>
       </callback>
-      <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" c:type="_delete_file_finish">
+      <callback name="query_filesystem_info_async"
+                c:type="query_filesystem_info_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="trash" c:type="trash">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
+          </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <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="trash_async" c:type="_trash_async">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="trash_finish" c:type="_trash_finish">
+      <callback name="query_filesystem_info_finish"
+                c:type="query_filesystem_info_finish">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="FileInfo" c:type="GFileInfo*"/>
         </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="make_directory" c:type="make_directory">
+      <callback name="find_enclosing_mount" c:type="find_enclosing_mount">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
         <parameters>
           <parameter name="file">
@@ -6456,25 +7567,55 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="make_directory_async" c:type="_make_directory_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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="make_directory_finish" c:type="_make_directory_finish">
+      <callback name="find_enclosing_mount_finish"
+                c:type="find_enclosing_mount_finish">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="make_symbolic_link" c:type="make_symbolic_link">
+      <callback name="set_display_name" c:type="set_display_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="symlink_value">
+          <parameter name="display_name">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="cancellable">
@@ -6485,176 +7626,158 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="make_symbolic_link_async"
-                c:type="_make_symbolic_link_async">
+      <callback name="set_display_name_async" c:type="set_display_name_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <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" c:type="copy">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
         <parameters>
-          <parameter name="source">
+          <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="destination">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="display_name">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="progress_callback">
-            <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="progress_callback_data">
+          <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
-          </parameter>
         </parameters>
       </callback>
-      <callback name="copy_async" c:type="copy_async">
+      <callback name="set_display_name_finish"
+                c:type="set_display_name_finish">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="File" c:type="GFile*"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="destination">
+          <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
-          </parameter>
-          <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
-          </parameter>
-          <parameter name="cancellable">
-            <type name="Cancellable" c:type="GCancellable*"/>
-          </parameter>
-          <parameter name="progress_callback">
-            <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
-          </parameter>
-          <parameter name="progress_callback_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_finish" c:type="copy_finish">
+      <callback name="query_settable_attributes"
+                c:type="query_settable_attributes">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="res">
-            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          <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="move" c:type="move">
+      <callback name="query_settable_attributes_async"
+                c:type="_query_settable_attributes_async">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <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"
+                c:type="query_writable_namespaces">
+        <return-value>
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="File" c:type="GFile*"/>
-          </parameter>
-          <parameter name="destination">
+          <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
-          </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="progress_callback">
-            <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.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="move_async" c:type="_move_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="move_finish" c:type="_move_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="mount_mountable" c:type="mount_mountable">
+      <callback name="set_attribute" c:type="set_attribute">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="MountMountFlags" c:type="GMountMountFlags"/>
+          <parameter name="attribute">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="mount_operation">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="type">
+            <type name="FileAttributeType" c:type="GFileAttributeType"/>
+          </parameter>
+          <parameter name="value_p">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
           </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 name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="mount_mountable_finish" c:type="mount_mountable_finish">
+      <callback name="set_attributes_from_info"
+                c:type="set_attributes_from_info">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="result">
-            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </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="unmount_mountable" c:type="unmount_mountable">
+      <callback name="set_attributes_async" c:type="set_attributes_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6662,8 +7785,14 @@
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
           <parameter name="flags">
-            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6676,8 +7805,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="unmount_mountable_finish"
-                c:type="unmount_mountable_finish">
+      <callback name="set_attributes_finish" c:type="set_attributes_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -6688,12 +7816,31 @@
           <parameter name="result">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo**"/>
+          </parameter>
           <parameter name="error">
             <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_mountable" c:type="eject_mountable">
+      <callback name="read_fn" c:type="read_fn">
+        <return-value>
+          <type name="FileInputStream" c:type="GFileInputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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>
@@ -6701,8 +7848,8 @@
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6715,15 +7862,15 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_mountable_finish" c:type="eject_mountable_finish">
+      <callback name="read_finish" c:type="read_finish">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="FileInputStream" c:type="GFileInputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="result">
+          <parameter name="res">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
@@ -6731,19 +7878,38 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="mount_enclosing_volume" c:type="mount_enclosing_volume">
+      <callback name="append_to" c:type="append_to">
+        <return-value>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </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="append_to_async" c:type="append_to_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="location">
+          <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="MountMountFlags" c:type="GMountMountFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
-          <parameter name="mount_operation">
-            <type name="MountOperation" c:type="GMountOperation*"/>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6756,16 +7922,15 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="mount_enclosing_volume_finish"
-                c:type="mount_enclosing_volume_finish">
+      <callback name="append_to_finish" c:type="append_to_finish">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
-          <parameter name="location">
+          <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="result">
+          <parameter name="res">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
           <parameter name="error">
@@ -6773,16 +7938,16 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="monitor_dir" c:type="monitor_dir">
+      <callback name="create" c:type="create">
         <return-value>
-          <type name="FileMonitor" c:type="GFileMonitor*"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="FileMonitorFlags" c:type="GFileMonitorFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -6792,272 +7957,392 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="monitor_file" c:type="monitor_file">
+      <callback name="create_async" c:type="create_async">
         <return-value>
-          <type name="FileMonitor" c:type="GFileMonitor*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
-            <type name="FileMonitorFlags" c:type="GFileMonitorFlags"/>
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.Error" c:type="GError**"/>
+          <parameter name="callback">
+            <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-    </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">
+      <callback name="create_finish" c:type="create_finish">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </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 name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_rate_limit"
-              c:identifier="g_file_monitor_set_rate_limit">
+      </callback>
+      <callback name="replace" c:type="replace">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="limit_msecs">
-            <type name="int32" c:type="int"/>
+          <parameter name="etag">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="make_backup">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </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="emit_event" c:identifier="g_file_monitor_emit_event">
+      </callback>
+      <callback name="replace_async" c:type="replace_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="FileMonitor" c:type="GFileMonitor*"/>
-          </parameter>
-          <parameter name="child">
+          <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="other_file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="etag">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="event_type">
-            <type name="FileMonitorEvent" c:type="GFileMonitorEvent"/>
+          <parameter name="make_backup">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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>
-      <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">
+      </callback>
+      <callback name="replace_finish" c:type="replace_finish">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="FileMonitor" c:type="GFileMonitor*"/>
-          </parameter>
           <parameter name="file">
             <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="other_file">
-            <type name="File" c:type="GFile*"/>
+          <parameter name="res">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
           </parameter>
-          <parameter name="event_type">
-            <type name="FileMonitorEvent" c:type="GFileMonitorEvent"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cancel" c:type="cancel">
+      <callback name="delete_file" c:type="delete_file">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="g_reserved1" c:type="_g_reserved1">
+      <callback name="delete_file_async" c:type="_delete_file_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="g_reserved2" c:type="_g_reserved2">
+      <callback name="delete_file_finish" c:type="_delete_file_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="g_reserved3" c:type="_g_reserved3">
+      <callback name="trash" c:type="trash">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="g_reserved4" c:type="_g_reserved4">
+      <callback name="trash_async" c:type="_trash_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="g_reserved5" c:type="_g_reserved5">
+      <callback name="trash_finish" c:type="_trash_finish">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="changed">
+      <callback name="make_directory" c:type="make_directory">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="File" c:type="GFile"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="File" c:type="GFile"/>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="FileMonitorEvent" c:type="GFileMonitorEvent"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </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">
+      </callback>
+      <callback name="make_directory_async" c:type="_make_directory_async">
         <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">
+      <callback name="make_directory_finish" c:type="_make_directory_finish">
         <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">
+      <callback name="make_symbolic_link" c:type="make_symbolic_link">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </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 name="symlink_value">
+            <type name="string" c:type="char*"/>
           </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 name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="et_uuid" c:type="get_uuid">
+      <callback name="make_symbolic_link_async"
+                c:type="_make_symbolic_link_async">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="et_volume" c:type="get_volume">
+      <callback name="make_symbolic_link_finish"
+                c:type="_make_symbolic_link_finish">
         <return-value>
-          <type name="Volume" c:type="GVolume*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="et_drive" c:type="get_drive">
+      <callback name="copy" c:type="copy">
         <return-value>
-          <type name="Drive" c:type="GDrive*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="source">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="destination">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="progress_callback">
+            <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.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_unmount" c:type="can_unmount">
+      <callback name="copy_async" c:type="copy_async">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="source">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="destination">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="progress_callback">
+            <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
+          </parameter>
+          <parameter name="progress_callback_data">
+            <type name="any" c:type="gpointer"/>
+          </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" c:type="can_eject">
+      <callback name="copy_finish" c:type="copy_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="unmount" c:type="unmount">
+      <callback name="move" c:type="move">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="destination">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="progress_callback">
+            <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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_async" c:type="_move_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="move_finish" c:type="_move_finish">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="mount_mountable" c:type="mount_mountable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="mount_mountable_finish" c:type="mount_mountable_finish">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_mountable" c:type="unmount_mountable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
             <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
@@ -7073,13 +8358,14 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="unmount_finish" c:type="unmount_finish">
+      <callback name="unmount_mountable_finish"
+                c:type="unmount_mountable_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -7089,13 +8375,13 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject" c:type="eject">
+      <callback name="eject_mountable" c:type="eject_mountable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
             <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
@@ -7111,13 +8397,13 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_finish" c:type="eject_finish">
+      <callback name="eject_mountable_finish" c:type="eject_mountable_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -7127,13 +8413,13 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="remount" c:type="remount">
+      <callback name="mount_enclosing_volume" c:type="mount_enclosing_volume">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="location">
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="flags">
             <type name="MountMountFlags" c:type="GMountMountFlags"/>
@@ -7152,13 +8438,14 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="remount_finish" c:type="remount_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="mount">
-            <type name="Mount" c:type="GMount*"/>
+          <parameter name="location">
+            <type name="File" c:type="GFile*"/>
           </parameter>
           <parameter name="result">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -7168,455 +8455,2165 @@
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="changed">
+      <callback name="monitor_dir" c:type="monitor_dir">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="FileMonitor" c:type="GFileMonitor*"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="unmounted">
+        <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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="monitor_file" c:type="monitor_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="FileMonitor" c:type="GFileMonitor*"/>
         </return-value>
-      </glib:signal>
+        <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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
     </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="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="path">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_new_for_uri" c:identifier="g_file_new_for_uri">
-      <return-value>
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="uri">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_new_for_commandline_arg"
-              c:identifier="g_file_new_for_commandline_arg">
-      <return-value>
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="arg">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_parse_name" c:identifier="g_file_parse_name">
-      <return-value>
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parse_name">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_dup" c:identifier="g_file_dup">
-      <return-value>
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_hash" c:identifier="g_file_hash">
-      <return-value>
-        <type name="uint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="any" c:type="gconstpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_equal" c:identifier="g_file_equal">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file1">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="file2">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_basename" c:identifier="g_file_get_basename">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_path" c:identifier="g_file_get_path">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_uri" c:identifier="g_file_get_uri">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_parse_name" c:identifier="g_file_get_parse_name">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_parent" c:identifier="g_file_get_parent">
-      <return-value>
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_child" c:identifier="g_file_get_child">
-      <return-value>
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_child_for_display_name"
-              c:identifier="g_file_get_child_for_display_name">
-      <return-value>
-        <type name="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
+    <record name="FileIface" c:type="GFileIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="dup" c:type="dup">
+        <return-value>
           <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="display_name">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="hash" c:type="hash">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="equal" c:type="equal">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file1">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="file2">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_native" c:type="is_native">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="uri_scheme">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_uri_scheme" c:type="get_uri_scheme">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_has_prefix" c:identifier="g_file_has_prefix">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="prefix">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_relative_path"
-              c:identifier="g_file_get_relative_path">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="descendant">
-          <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="File" c:type="GFile*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="relative_path">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_basename" c:type="get_basename">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_is_native" c:identifier="g_file_is_native">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_has_uri_scheme" c:identifier="g_file_has_uri_scheme">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="uri_scheme">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_path" c:type="get_path">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_get_uri_scheme" c:identifier="g_file_get_uri_scheme">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_read" c:identifier="g_file_read">
-      <return-value>
-        <type name="FileInputStream" c:type="GFileInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_read_async" c:identifier="g_file_read_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </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>
-    </function>
-    <function name="file_read_finish" c:identifier="g_file_read_finish">
-      <return-value>
-        <type name="FileInputStream" c:type="GFileInputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="res">
-          <type name="AsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <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="FileOutputStream" c:type="GFileOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_create" c:identifier="g_file_create">
-      <return-value>
-        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_replace" c:identifier="g_file_replace">
-      <return-value>
-        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="etag">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_uri" c:type="get_uri">
+        <return-value>
           <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="make_backup">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
-        </parameter>
-        <parameter name="cancellable">
-          <type name="Cancellable" c:type="GCancellable*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_append_to_async"
-              c:identifier="g_file_append_to_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_parent" c:type="get_parent">
+        <return-value>
           <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
-        </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>
-    </function>
-    <function name="file_append_to_finish"
-              c:identifier="g_file_append_to_finish">
-      <return-value>
-        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="prefix_matches" c:type="prefix_matches">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="prefix">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="descendant">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="resolve_relative_path" c:type="resolve_relative_path">
+        <return-value>
           <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="res">
-          <type name="AsyncResult" c:type="GAsyncResult*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.Error" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_create_async" c:identifier="g_file_create_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="relative_path">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_child_for_display_name"
+                c:type="get_child_for_display_name">
+        <return-value>
           <type name="File" c:type="GFile*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
-        </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">
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="display_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="enumerate_children" c:type="enumerate_children">
+        <return-value>
+          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </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="enumerate_children_async"
+                c:type="enumerate_children_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="enumerate_children_finish"
+                c:type="enumerate_children_finish">
+        <return-value>
+          <type name="FileEnumerator" c:type="GFileEnumerator*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="query_info" c:type="query_info">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </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="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="file">
+            <type name="File" c:type="GFile*"/>
+          </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="query_filesystem_info" c:type="query_filesystem_info">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="attributes">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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_filesystem_info_finish"
+                c:type="query_filesystem_info_finish">
+        <return-value>
+          <type name="FileInfo" c:type="GFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="find_enclosing_mount" c:type="find_enclosing_mount">
+        <return-value>
+          <type name="Mount" c:type="GMount*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="find_enclosing_mount_finish"
+                c:type="find_enclosing_mount_finish">
+        <return-value>
+          <type name="Mount" c:type="GMount*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="set_display_name" c:type="set_display_name">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="display_name">
+            <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="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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="display_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="set_display_name_finish"
+                c:type="set_display_name_finish">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="query_settable_attributes"
+                c:type="query_settable_attributes">
+        <return-value>
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_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"
+                c:type="_query_settable_attributes_finish">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="query_writable_namespaces"
+                c:type="query_writable_namespaces">
+        <return-value>
+          <type name="FileAttributeInfoList" c:type="GFileAttributeInfoList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_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"
+                c:type="_query_writable_namespaces_finish">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="set_attribute" c:type="set_attribute">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </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="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="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </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="set_attributes_async" c:type="set_attributes_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="set_attributes_finish" c:type="set_attributes_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="AsyncResult" c:type="GAsyncResult*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GFileInfo**"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="read_fn" c:type="read_fn">
+        <return-value>
+          <type name="FileInputStream" c:type="GFileInputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="FileInputStream" c:type="GFileInputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="append_to" c:type="append_to">
+        <return-value>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </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="append_to_async" c:type="append_to_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="append_to_finish" c:type="append_to_finish">
+        <return-value>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="create" c:type="create">
+        <return-value>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </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="create_async" c:type="create_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="create_finish" c:type="create_finish">
+        <return-value>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="replace" c:type="replace">
+        <return-value>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="etag">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="make_backup">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </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="replace_async" c:type="replace_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="etag">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="make_backup">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" 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="replace_finish" c:type="replace_finish">
+        <return-value>
+          <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="delete_file" c:type="delete_file">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="delete_file_async" c:type="_delete_file_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="delete_file_finish" c:type="_delete_file_finish">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="trash" c:type="trash">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="trash_async" c:type="_trash_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="trash_finish" c:type="_trash_finish">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="make_directory" c:type="make_directory">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="make_directory_async" c:type="_make_directory_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <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" c:type="make_symbolic_link">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="symlink_value">
+            <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="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"
+                c:type="_make_symbolic_link_finish">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="copy" c:type="copy">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="destination">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="progress_callback">
+            <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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="copy_async" c:type="copy_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="destination">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
+          </parameter>
+          <parameter name="io_priority">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="progress_callback">
+            <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
+          </parameter>
+          <parameter name="progress_callback_data">
+            <type name="any" c:type="gpointer"/>
+          </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="copy_finish" c:type="copy_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="move" c:type="move">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="destination">
+            <type name="File" c:type="GFile*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
+          </parameter>
+          <parameter name="cancellable">
+            <type name="Cancellable" c:type="GCancellable*"/>
+          </parameter>
+          <parameter name="progress_callback">
+            <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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_async" c:type="_move_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="move_finish" c:type="_move_finish">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="mount_mountable" c:type="mount_mountable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="mount_mountable_finish" c:type="mount_mountable_finish">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_mountable" c:type="unmount_mountable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_mountable_finish"
+                c:type="unmount_mountable_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_mountable" c:type="eject_mountable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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_mountable_finish" c:type="eject_mountable_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file">
+            <type name="File" c:type="GFile*"/>
+          </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="mount_enclosing_volume" c:type="mount_enclosing_volume">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="location">
+            <type name="File" c:type="GFile*"/>
+          </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="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="File" c:type="GFile*"/>
+          </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="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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="monitor_file" c:type="monitor_file">
+        <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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
+    <class name="FileMonitor"
+           c:type="GFileMonitor"
+           parent="GObject.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="int" 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="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
+          <parameter name="file">
+            <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="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="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.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="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="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="goffset" 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="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_new_for_uri" c:identifier="g_file_new_for_uri">
+      <return-value>
+        <type name="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_new_for_commandline_arg"
+              c:identifier="g_file_new_for_commandline_arg">
+      <return-value>
+        <type name="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="arg">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_parse_name" c:identifier="g_file_parse_name">
+      <return-value>
+        <type name="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="parse_name">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_dup" c:identifier="g_file_dup">
+      <return-value>
+        <type name="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_hash" c:identifier="g_file_hash">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="any" c:type="gconstpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_equal" c:identifier="g_file_equal">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file1">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="file2">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_basename" c:identifier="g_file_get_basename">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_path" c:identifier="g_file_get_path">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_uri" c:identifier="g_file_get_uri">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_parse_name" c:identifier="g_file_get_parse_name">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_parent" c:identifier="g_file_get_parent">
+      <return-value>
+        <type name="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_child" c:identifier="g_file_get_child">
+      <return-value>
+        <type name="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_child_for_display_name"
+              c:identifier="g_file_get_child_for_display_name">
+      <return-value>
+        <type name="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="display_name">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_has_prefix" c:identifier="g_file_has_prefix">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="prefix">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_relative_path"
+              c:identifier="g_file_get_relative_path">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="parent">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="descendant">
+          <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="File" c:type="GFile*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="relative_path">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_is_native" c:identifier="g_file_is_native">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_has_uri_scheme" c:identifier="g_file_has_uri_scheme">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="uri_scheme">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_get_uri_scheme" c:identifier="g_file_get_uri_scheme">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_read" c:identifier="g_file_read">
+      <return-value>
+        <type name="FileInputStream" c:type="GFileInputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_read_async" c:identifier="g_file_read_async">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="io_priority">
+          <type name="int" 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>
+    </function>
+    <function name="file_read_finish" c:identifier="g_file_read_finish">
+      <return-value>
+        <type name="FileInputStream" c:type="GFileInputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="res">
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
+        </parameter>
+        <parameter name="error">
+          <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="FileOutputStream" c:type="GFileOutputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_create" c:identifier="g_file_create">
+      <return-value>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_replace" c:identifier="g_file_replace">
+      <return-value>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="etag">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="make_backup">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+        </parameter>
+        <parameter name="cancellable">
+          <type name="Cancellable" c:type="GCancellable*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_append_to_async"
+              c:identifier="g_file_append_to_async">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+        </parameter>
+        <parameter name="io_priority">
+          <type name="int" 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>
+    </function>
+    <function name="file_append_to_finish"
+              c:identifier="g_file_append_to_finish">
+      <return-value>
+        <type name="FileOutputStream" c:type="GFileOutputStream*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="res">
+          <type name="AsyncResult" c:type="GAsyncResult*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_create_async" c:identifier="g_file_create_async">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
+        </parameter>
+        <parameter name="io_priority">
+          <type name="int" 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">
@@ -7658,7 +10655,7 @@
           <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -7738,7 +10735,7 @@
           <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -7801,7 +10798,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -7858,7 +10855,7 @@
           <type name="File" c:type="GFile*"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -7927,7 +10924,7 @@
           <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -7990,7 +10987,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -8095,7 +11092,7 @@
           <type name="FileCopyFlags" c:type="GFileCopyFlags"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -8295,7 +11292,7 @@
           <type name="FileQueryInfoFlags" c:type="GFileQueryInfoFlags"/>
         </parameter>
         <parameter name="io_priority">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -8741,13 +11738,13 @@
           <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
         <parameter name="contents">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="etag_out">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -8787,13 +11784,13 @@
           <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="contents">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="etag_out">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -8836,13 +11833,13 @@
           <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="contents">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="etag_out">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -8862,7 +11859,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="etag">
           <type name="string" c:type="char*"/>
@@ -8874,7 +11871,7 @@
           <type name="FileCreateFlags" c:type="GFileCreateFlags"/>
         </parameter>
         <parameter name="new_etag">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -8897,7 +11894,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="etag">
           <type name="string" c:type="char*"/>
@@ -8932,7 +11929,7 @@
           <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
         <parameter name="new_etag">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -9127,7 +12124,7 @@
       </callback>
       <callback name="enumerate_identifiers" c:type="enumerate_identifiers">
         <return-value>
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </return-value>
         <parameters>
           <parameter name="volume">
@@ -9240,54 +12237,270 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="has_media" c:type="has_media">
+      <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="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="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="poll_for_media_finish" c:type="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>
+      </callback>
+      <callback name="et_identifier" c:type="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>
+      </callback>
+      <callback name="enumerate_identifiers" c:type="enumerate_identifiers">
+        <return-value>
+          <type name="int8" c:type="char**"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </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">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <record name="MountIface" c:type="GMountIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <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="boolean" c:type="gboolean"/>
+          <type name="Volume" c:type="GVolume*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="Drive" c:type="GDrive*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_media_check_automatic"
-                c:type="is_media_check_automatic">
+      <callback name="et_drive" c:type="get_drive">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Drive" c:type="GDrive*"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="Drive" c:type="GDrive*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_eject" c:type="can_eject">
+      <callback name="can_unmount" c:type="can_unmount">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="Drive" c:type="GDrive*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="can_poll_for_media" c:type="can_poll_for_media">
+      <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 name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject" c:type="eject">
+      <callback name="unmount" c:type="unmount">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="Drive" c:type="GDrive*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
           <parameter name="flags">
             <type name="MountUnmountFlags" c:type="GMountUnmountFlags"/>
@@ -9303,13 +12516,13 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="eject_finish" c:type="eject_finish">
+      <callback name="unmount_finish" c:type="unmount_finish">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="Drive" c:type="GDrive*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
           <parameter name="result">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -9319,13 +12532,16 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="poll_for_media" c:type="poll_for_media">
+      <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 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*"/>
@@ -9338,13 +12554,13 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="poll_for_media_finish" c:type="poll_for_media_finish">
+      <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 name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
           <parameter name="result">
             <type name="AsyncResult" c:type="GAsyncResult*"/>
@@ -9354,45 +12570,48 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="et_identifier" c:type="get_identifier">
+      <callback name="remount" c:type="remount">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="Drive" c:type="GDrive*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
-          <parameter name="kind">
-            <type name="string" c:type="char*"/>
+          <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="enumerate_identifiers" c:type="enumerate_identifiers">
+      <callback name="remount_finish" c:type="remount_finish">
         <return-value>
-          <type name="char" c:type="char**"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="drive">
-            <type name="Drive" c:type="GDrive*"/>
+          <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>
-      <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">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
+    </record>
     <function name="mount_get_root" c:identifier="g_mount_get_root">
       <return-value>
         <type name="File" c:type="GFile*"/>
@@ -9592,6 +12811,213 @@
         </parameter>
       </parameters>
     </function>
+    <record name="VolumeIface" c:type="GVolumeIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="removed" c:type="removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_name" c:type="get_name">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_icon" c:type="get_icon">
+        <return-value>
+          <type name="Icon" c:type="GIcon*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_uuid" c:type="get_uuid">
+        <return-value>
+          <type name="string" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_drive" c:type="get_drive">
+        <return-value>
+          <type name="Drive" c:type="GDrive*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_mount" c:type="get_mount">
+        <return-value>
+          <type name="Mount" c:type="GMount*"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_mount" c:type="can_mount">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_eject" c:type="can_eject">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <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="mount_finish" c:type="mount_finish">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <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="eject" c:type="eject">
+        <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="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="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="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="int8" 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>
+    </record>
     <function name="volume_get_name" c:identifier="g_volume_get_name">
       <return-value>
         <type name="string" c:type="char*"/>
@@ -9769,7 +13195,7 @@
     <function name="volume_enumerate_identifiers"
               c:identifier="g_volume_enumerate_identifiers">
       <return-value>
-        <type name="char" c:type="char**"/>
+        <type name="int8" c:type="char**"/>
       </return-value>
       <parameters>
         <parameter name="volume">
@@ -9777,6 +13203,228 @@
         </parameter>
       </parameters>
     </function>
+    <record name="DriveIface" c:type="GDriveIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <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="disconnected" c:type="disconnected">
+        <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_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="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="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="poll_for_media_finish" c:type="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>
+      </callback>
+      <callback name="et_identifier" c:type="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>
+      </callback>
+      <callback name="enumerate_identifiers" c:type="enumerate_identifiers">
+        <return-value>
+          <type name="int8" c:type="char**"/>
+        </return-value>
+        <parameters>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="drive_get_name" c:identifier="g_drive_get_name">
       <return-value>
         <type name="string" c:type="char*"/>
@@ -9956,428 +13604,1045 @@
         </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">
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drive_enumerate_identifiers"
+              c:identifier="g_drive_enumerate_identifiers">
+      <return-value>
+        <type name="int8" 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="int" c:type="int"/>
+          </parameter>
+          <parameter name="type">
+            <type name="int8" 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="int" 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="int8" c:type="char**"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </interface>
+    <record name="LoadableIconIface" c:type="GLoadableIconIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <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="int" c:type="int"/>
+          </parameter>
+          <parameter name="type">
+            <type name="int8" 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="int" 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="int8" c:type="char**"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
+    <function name="loadable_icon_load" c:identifier="g_loadable_icon_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="int" c:type="int"/>
+        </parameter>
+        <parameter name="type">
+          <type name="int8" 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>
+    </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="LoadableIcon" c:type="GLoadableIcon*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="int" 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>
+    </function>
+    <function name="loadable_icon_load_finish"
+              c:identifier="g_loadable_icon_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="int8" c:type="char**"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="FileIcon"
+           c:type="GFileIcon"
+           parent="GObject.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>
+    <record name="FileIconClass" c:type="GFileIconClass"/>
+    <function name="file_icon_new" c:identifier="g_file_icon_new">
+      <return-value>
+        <type name="Icon" c:type="GIcon*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file">
+          <type name="File" c:type="GFile*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <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="FileMonitorClass" c:type="GFileMonitorClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="FileMonitor" c:type="GFileMonitor*"/>
+          </parameter>
+          <parameter name="file">
+            <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>
+    </record>
+    <record name="FileMonitorPrivate" c:type="GFileMonitorPrivate"/>
+    <class name="FilenameCompleter"
+           c:type="GFilenameCompleter"
+           parent="GObject.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="int8" 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="completer">
+            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          </parameter>
+          <parameter name="dirs_only">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="ot_completion_data" c:type="got_completion_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filename_completer">
+            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          </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>
+      <glib:signal name="got-completion-data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="FilenameCompleterClass" c:type="GFilenameCompleterClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="ot_completion_data" c:type="got_completion_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filename_completer">
+            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          </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>
+    </record>
+    <class name="Vfs"
+           c:type="GVfs"
+           parent="GObject.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="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_file_for_path" c:identifier="g_vfs_get_file_for_path">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_file_for_uri" c:identifier="g_vfs_get_file_for_uri">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_supported_uri_schemes"
+              c:identifier="g_vfs_get_supported_uri_schemes">
+        <return-value>
+          <type name="GLib.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="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_file_for_path" c:type="get_file_for_path">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_file_for_uri" c:type="get_file_for_uri">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_supported_uri_schemes"
+                c:type="get_supported_uri_schemes">
+        <return-value>
+          <type name="GLib.char" c:type="gchar**"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="parse_name" c:type="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>
+      </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>
+    </class>
+    <record name="VfsClass" c:type="GVfsClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="is_active" c:type="is_active">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_file_for_path" c:type="get_file_for_path">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_file_for_uri" c:type="get_file_for_uri">
+        <return-value>
+          <type name="File" c:type="GFile*"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="et_supported_uri_schemes"
+                c:type="get_supported_uri_schemes">
+        <return-value>
+          <type name="GLib.char" c:type="gchar**"/>
+        </return-value>
+        <parameters>
+          <parameter name="vfs">
+            <type name="Vfs" c:type="GVfs*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="parse_name" c:type="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>
+      </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>
+    </record>
+    <class name="VolumeMonitor"
+           c:type="GVolumeMonitor"
+           parent="GObject.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="InputStream" c:type="GInputStream*"/>
+          <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="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 name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="load_async" c:type="load_async">
+      </method>
+      <method name="get_volumes" c:identifier="g_volume_monitor_get_volumes">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </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 name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="load_finish" c:type="load_finish">
+      </method>
+      <method name="get_mounts" c:identifier="g_volume_monitor_get_mounts">
         <return-value>
-          <type name="InputStream" c:type="GInputStream*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </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 name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
-      </callback>
-    </interface>
-    <function name="loadable_icon_load" c:identifier="g_loadable_icon_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>
-    </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="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>
-    </function>
-    <function name="loadable_icon_load_finish"
-              c:identifier="g_loadable_icon_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>
-    </function>
-    <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">
+      </method>
+      <method name="get_volume_for_uuid"
+              c:identifier="g_volume_monitor_get_volume_for_uuid">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="Volume" c:type="GVolume*"/>
         </return-value>
         <parameters>
-          <parameter name="icon">
-            <type name="FileIcon" c:type="GFileIcon*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="uuid">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
-    </class>
-    <function name="file_icon_new" c:identifier="g_file_icon_new">
-      <return-value>
-        <type name="Icon" c:type="GIcon*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file">
-          <type name="File" c:type="GFile*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <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">
+      <method name="get_mount_for_uuid"
+              c:identifier="g_volume_monitor_get_mount_for_uuid">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
         <parameters>
-          <parameter name="completer">
-            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="initial_text">
+          <parameter name="uuid">
             <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_completions"
-              c:identifier="g_filename_completer_get_completions">
+      <callback name="volume_added" c:type="volume_added">
         <return-value>
-          <type name="char" c:type="char**"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completer">
-            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="initial_text">
-            <type name="string" c:type="char*"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_dirs_only"
-              c:identifier="g_filename_completer_set_dirs_only">
+      </callback>
+      <callback name="volume_removed" c:type="volume_removed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completer">
-            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="dirs_only">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="volume">
+            <type name="Volume" c:type="GVolume*"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="ot_completion_data" c:type="got_completion_data">
+      </callback>
+      <callback name="volume_changed" c:type="volume_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filename_completer">
-            <type name="FilenameCompleter" c:type="GFilenameCompleter*"/>
+          <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="g_reserved1" c:type="_g_reserved1">
+      <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="mount">
+            <type name="Mount" c:type="GMount*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="g_reserved2" c:type="_g_reserved2">
+      <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="g_reserved3" c:type="_g_reserved3">
+      <callback name="mount_pre_unmount" c:type="mount_pre_unmount">
         <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>
-      <glib:signal name="got-completion-data">
+      <callback name="mount_changed" c:type="mount_changed">
         <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="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_file_for_path" c:identifier="g_vfs_get_file_for_path">
+      </callback>
+      <callback name="drive_connected" c:type="drive_connected">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="char*"/>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_file_for_uri" c:identifier="g_vfs_get_file_for_uri">
+      </callback>
+      <callback name="drive_disconnected" c:type="drive_disconnected">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="char*"/>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_supported_uri_schemes"
-              c:identifier="g_vfs_get_supported_uri_schemes">
+      </callback>
+      <callback name="drive_changed" c:type="drive_changed">
         <return-value>
-          <type name="char" c:type="gchar**"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          </parameter>
+          <parameter name="drive">
+            <type name="Drive" c:type="GDrive*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="parse_name" c:identifier="g_vfs_parse_name">
+      </callback>
+      <callback name="is_supported" c:type="is_supported">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="boolean" c:type="gboolean"/>
+        </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="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
-          </parameter>
-          <parameter name="parse_name">
-            <type name="string" c:type="char*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="is_active" c:type="is_active">
+      </callback>
+      <callback name="et_volumes" c:type="get_volumes">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="et_file_for_path" c:type="get_file_for_path">
+      <callback name="et_mounts" c:type="get_mounts">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="char*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="et_file_for_uri" c:type="get_file_for_uri">
+      <callback name="et_volume_for_uuid" c:type="get_volume_for_uuid">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="Volume" c:type="GVolume*"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
-          <parameter name="uri">
+          <parameter name="uuid">
             <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="et_supported_uri_schemes"
-                c:type="get_supported_uri_schemes">
+      <callback name="et_mount_for_uuid" c:type="get_mount_for_uuid">
         <return-value>
-          <type name="char" c:type="gchar**"/>
+          <type name="Mount" c:type="GMount*"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <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="parse_name" c:type="parse_name">
+      <callback name="adopt_orphan_mount" c:type="adopt_orphan_mount">
         <return-value>
-          <type name="File" c:type="GFile*"/>
+          <type name="Volume" c:type="GVolume*"/>
         </return-value>
         <parameters>
-          <parameter name="vfs">
-            <type name="Vfs" c:type="GVfs*"/>
+          <parameter name="mount">
+            <type name="Mount" c:type="GMount*"/>
           </parameter>
-          <parameter name="parse_name">
-            <type name="string" c:type="char*"/>
+          <parameter name="volume_monitor">
+            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10421,96 +14686,111 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="g_reserved9" c:type="_g_reserved9">
+      <glib:signal name="volume-added">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="g_reserved10" c:type="_g_reserved10">
+        <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>
-      </callback>
-      <callback name="g_reserved11" c:type="_g_reserved11">
+        <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>
-      </callback>
-      <callback name="g_reserved12" c:type="_g_reserved12">
+        <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>
-      </callback>
-    </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">
+        <parameters>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mount-removed">
         <return-value>
-          <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <method name="get_connected_drives"
-              c:identifier="g_volume_monitor_get_connected_drives">
+        <parameters>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mount-pre-unmount">
         <return-value>
-          <type name="GLib.List" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="volume_monitor">
-            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_volumes" c:identifier="g_volume_monitor_get_volumes">
+      </glib:signal>
+      <glib:signal name="mount-changed">
         <return-value>
-          <type name="GLib.List" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="volume_monitor">
-            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          <parameter name="object">
+            <type name="Mount" c:type="GMount"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_mounts" c:identifier="g_volume_monitor_get_mounts">
+      </glib:signal>
+      <glib:signal name="drive-connected">
         <return-value>
-          <type name="GLib.List" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="volume_monitor">
-            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
+          <parameter name="object">
+            <type name="Drive" c:type="GDrive"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_volume_for_uuid"
-              c:identifier="g_volume_monitor_get_volume_for_uuid">
+      </glib:signal>
+      <glib:signal name="drive-disconnected">
         <return-value>
-          <type name="Volume" c:type="GVolume*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="volume_monitor">
-            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
-          </parameter>
-          <parameter name="uuid">
-            <type name="string" c:type="char*"/>
+          <parameter name="object">
+            <type name="Drive" c:type="GDrive"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_mount_for_uuid"
-              c:identifier="g_volume_monitor_get_mount_for_uuid">
+      </glib:signal>
+      <glib:signal name="drive-changed">
         <return-value>
-          <type name="Mount" c:type="GMount*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="volume_monitor">
-            <type name="VolumeMonitor" c:type="GVolumeMonitor*"/>
-          </parameter>
-          <parameter name="uuid">
-            <type name="string" c:type="char*"/>
+          <parameter name="object">
+            <type name="Drive" c:type="GDrive"/>
           </parameter>
         </parameters>
-      </method>
+      </glib:signal>
+    </class>
+    <record name="VolumeMonitorClass" c:type="GVolumeMonitorClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
       <callback name="volume_added" c:type="volume_added">
         <return-value>
           <type name="none" c:type="void"/>
@@ -10755,107 +15035,7 @@
           <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>
+    </record>
     <function name="volume_monitor_adopt_orphan_mount"
               c:identifier="g_volume_monitor_adopt_orphan_mount">
       <return-value>
@@ -10869,7 +15049,7 @@
     </function>
     <class name="ThemedIcon"
            c:type="GThemedIcon"
-           parent="Object"
+           parent="GObject.Object"
            glib:type-name="GThemedIcon"
            glib:get-type="g_themed_icon_get_type">
       <method name="append_name" c:identifier="g_themed_icon_append_name">
@@ -10887,7 +15067,7 @@
       </method>
       <method name="get_names" c:identifier="g_themed_icon_get_names">
         <return-value>
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </return-value>
         <parameters>
           <parameter name="icon">
@@ -10899,12 +15079,13 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="names">
-        <type name="Strv" c:type="GStrv"/>
+        <type name="GObject.Strv" c:type="GStrv"/>
       </property>
       <property name="use-default-fallbacks">
         <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
+    <record name="ThemedIconClass" c:type="GThemedIconClass"/>
     <function name="themed_icon_new" c:identifier="g_themed_icon_new">
       <return-value>
         <type name="Icon" c:type="GIcon*"/>
@@ -10933,10 +15114,10 @@
       </return-value>
       <parameters>
         <parameter name="iconnames">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="len">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -10946,7 +15127,7 @@
                glib:get-type="g_seekable_get_type">
       <callback name="tell" c:type="tell">
         <return-value>
-          <type name="offset" c:type="goffset"/>
+          <type name="goffset" c:type="goffset"/>
         </return-value>
         <parameters>
           <parameter name="seekable">
@@ -10973,7 +15154,7 @@
             <type name="Seekable" c:type="GSeekable*"/>
           </parameter>
           <parameter name="offset">
-            <type name="offset" c:type="goffset"/>
+            <type name="goffset" c:type="goffset"/>
           </parameter>
           <parameter name="type">
             <type name="GLib.SeekType" c:type="GSeekType"/>
@@ -11005,7 +15186,7 @@
             <type name="Seekable" c:type="GSeekable*"/>
           </parameter>
           <parameter name="offset">
-            <type name="offset" c:type="goffset"/>
+            <type name="goffset" c:type="goffset"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -11016,9 +15197,85 @@
         </parameters>
       </callback>
     </interface>
+    <record name="SeekableIface" c:type="GSeekableIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="tell" c:type="tell">
+        <return-value>
+          <type name="goffset" c:type="goffset"/>
+        </return-value>
+        <parameters>
+          <parameter name="seekable">
+            <type name="Seekable" c:type="GSeekable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="can_seek" c:type="can_seek">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="seekable">
+            <type name="Seekable" c:type="GSeekable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="seek" c:type="seek">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="seekable">
+            <type name="Seekable" c:type="GSeekable*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="goffset" 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="seekable">
+            <type name="Seekable" c:type="GSeekable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="truncate_fn" c:type="truncate_fn">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="seekable">
+            <type name="Seekable" c:type="GSeekable*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="goffset" 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>
+    </record>
     <function name="seekable_tell" c:identifier="g_seekable_tell">
       <return-value>
-        <type name="offset" c:type="goffset"/>
+        <type name="goffset" c:type="goffset"/>
       </return-value>
       <parameters>
         <parameter name="seekable">
@@ -11045,7 +15302,7 @@
           <type name="Seekable" c:type="GSeekable*"/>
         </parameter>
         <parameter name="offset">
-          <type name="offset" c:type="goffset"/>
+          <type name="goffset" c:type="goffset"/>
         </parameter>
         <parameter name="type">
           <type name="GLib.SeekType" c:type="GSeekType"/>
@@ -11078,7 +15335,7 @@
           <type name="Seekable" c:type="GSeekable*"/>
         </parameter>
         <parameter name="offset">
-          <type name="offset" c:type="goffset"/>
+          <type name="goffset" c:type="goffset"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -11088,13 +15345,9 @@
         </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="TypeModule"
+           parent="GObject.TypeModule"
            glib:type-name="GIOModule"
            glib:get-type="g_io_module_get_type">
       <constructor name="new" c:identifier="g_io_module_new">
@@ -11128,6 +15381,9 @@
         </parameters>
       </method>
     </class>
+    <record name="ModuleClass" c:type="GIOModuleClass"/>
+    <record name="ExtensionPoint" c:type="GIOExtensionPoint"/>
+    <record name="Extension" c:type="GIOExtension"/>
     <function name="io_modules_load_all_in_directory"
               c:identifier="g_io_modules_load_all_in_directory">
       <return-value>
@@ -11171,14 +15427,14 @@
           <type name="ExtensionPoint" c:type="GIOExtensionPoint*"/>
         </parameter>
         <parameter name="type">
-          <type name="Type" c:type="GType"/>
+          <type name="GObject.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="Type" c:type="GType"/>
+        <type name="GObject.Type" c:type="GType"/>
       </return-value>
       <parameters>
         <parameter name="extension_point">
@@ -11221,7 +15477,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="type">
-          <type name="Type" c:type="GType"/>
+          <type name="GObject.Type" c:type="GType"/>
         </parameter>
         <parameter name="extension_name">
           <type name="string" c:type="char*"/>
@@ -11234,7 +15490,7 @@
     <function name="io_extension_get_type"
               c:identifier="g_io_extension_get_type">
       <return-value>
-        <type name="Type" c:type="GType"/>
+        <type name="GObject.Type" c:type="GType"/>
       </return-value>
       <parameters>
         <parameter name="extension">
@@ -11275,7 +15531,7 @@
         </parameter>
       </parameters>
     </function>
-    <record name="IOSchedulerJob" c:type="GIOSchedulerJob"/>
+    <record name="SchedulerJob" c:type="GIOSchedulerJob"/>
     <callback name="SchedulerJobFunc" c:type="GIOSchedulerJobFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -11378,7 +15634,7 @@
             <type name="any" c:type="void*"/>
           </parameter>
           <parameter name="len">
-            <type name="ssize" c:type="gssize"/>
+            <type name="ssize_t" c:type="gssize"/>
           </parameter>
           <parameter name="destroy">
             <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
@@ -11411,6 +15667,36 @@
         </return-value>
       </callback>
     </class>
+    <record name="MemoryInputStreamClass" c:type="GMemoryInputStreamClass">
+      <field name="parent_class">
+        <type name="InputStreamClass" c:type="GInputStreamClass"/>
+      </field>
+      <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>
+    </record>
     <record name="MemoryInputStreamPrivate"
             c:type="GMemoryInputStreamPrivate"/>
     <function name="memory_input_stream_new"
@@ -11429,7 +15715,7 @@
           <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="destroy">
           <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
@@ -11453,7 +15739,7 @@
       </method>
       <method name="get_size" c:identifier="g_memory_output_stream_get_size">
         <return-value>
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </return-value>
         <parameters>
           <parameter name="ostream">
@@ -11487,6 +15773,36 @@
         </return-value>
       </callback>
     </class>
+    <record name="MemoryOutputStreamClass" c:type="GMemoryOutputStreamClass">
+      <field name="parent_class">
+        <type name="OutputStreamClass" c:type="GOutputStreamClass"/>
+      </field>
+      <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>
+    </record>
     <record name="MemoryOutputStreamPrivate"
             c:type="GMemoryOutputStreamPrivate"/>
     <callback name="ReallocFunc" c:type="GReallocFunc">
@@ -11498,7 +15814,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </callback>
@@ -11512,7 +15828,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="len">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="realloc_fn">
           <type name="ReallocFunc" c:type="GReallocFunc"/>
@@ -11524,7 +15840,7 @@
     </function>
     <class name="SimpleAsyncResult"
            c:type="GSimpleAsyncResult"
-           parent="Object"
+           parent="GObject.Object"
            glib:type-name="GSimpleAsyncResult"
            glib:get-type="g_simple_async_result_get_type">
       <constructor name="new" c:identifier="g_simple_async_result_new">
@@ -11533,7 +15849,7 @@
         </return-value>
         <parameters>
           <parameter name="source_object">
-            <type name="Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="callback">
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
@@ -11553,7 +15869,7 @@
         </return-value>
         <parameters>
           <parameter name="source_object">
-            <type name="Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="callback">
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
@@ -11562,7 +15878,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="domain">
-            <type name="Quark" c:type="GQuark"/>
+            <type name="GLib.Quark" c:type="GQuark"/>
           </parameter>
           <parameter name="code">
             <type name="int" c:type="gint"/>
@@ -11579,7 +15895,7 @@
         </return-value>
         <parameters>
           <parameter name="source_object">
-            <type name="Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="callback">
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
@@ -11630,14 +15946,14 @@
             <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
           </parameter>
           <parameter name="op_res">
-            <type name="ssize" c:type="gssize"/>
+            <type name="ssize_t" 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"/>
+          <type name="ssize_t" c:type="gssize"/>
         </return-value>
         <parameters>
           <parameter name="simple">
@@ -11730,7 +16046,7 @@
                   c:type="GSimpleAsyncThreadFunc"/>
           </parameter>
           <parameter name="io_priority">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="cancellable">
             <type name="Cancellable" c:type="GCancellable*"/>
@@ -11774,7 +16090,7 @@
             <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
           </parameter>
           <parameter name="domain">
-            <type name="Quark" c:type="GQuark"/>
+            <type name="GLib.Quark" c:type="GQuark"/>
           </parameter>
           <parameter name="code">
             <type name="int" c:type="gint"/>
@@ -11785,6 +16101,7 @@
         </parameters>
       </method>
     </class>
+    <record name="SimpleAsyncResultClass" c:type="GSimpleAsyncResultClass"/>
     <callback name="SimpleAsyncThreadFunc" c:type="GSimpleAsyncThreadFunc">
       <return-value>
         <type name="none" c:type="void"/>
@@ -11794,7 +16111,7 @@
           <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
         </parameter>
         <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="cancellable">
           <type name="Cancellable" c:type="GCancellable*"/>
@@ -11808,7 +16125,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="callback">
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
@@ -11817,7 +16134,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="domain">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="code">
           <type name="int" c:type="gint"/>
@@ -11834,7 +16151,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="callback">
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
@@ -11867,5 +16184,24 @@
         </parameters>
       </callback>
     </class>
+    <record name="NativeVolumeMonitorClass" c:type="GNativeVolumeMonitorClass">
+      <field name="parent_class">
+        <type name="VolumeMonitorClass" c:type="GVolumeMonitorClass"/>
+      </field>
+      <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>
+    </record>
   </namespace>
 </repository>

diff --git a/gir/glib-2.0-good.gir b/gir/glib-2.0-good.gir
index a78baaf..be9368f 100644 (file)
--- a/gir/glib-2.0-good.gir
+++ b/gir/glib-2.0-good.gir
@@ -3,28 +3,26 @@
             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="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="IConv" target="none" c:type="GIConv"/>
+    <alias name="short" target="int16" c:type="gshort"/>
     <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="unichar" target="uint32" c:type="gunichar"/>
+    <alias name="int" target="int" c:type="gint"/>
     <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="ushort" target="unsigned" c:type="gushort"/>
+    <alias name="DateDay" target="uint8" c:type="GDateDay"/>
+    <alias name="long" target="long" c:type="glong"/>
     <alias name="Quark" target="uint32" c:type="GQuark"/>
+    <alias name="char" target="int8" c:type="gchar"/>
+    <alias name="uchar" target="unsigned" c:type="guchar"/>
+    <alias name="float" target="float" c:type="gfloat"/>
+    <alias name="boolean" target="int" c:type="gboolean"/>
+    <alias name="uint" target="unsigned" c:type="guint"/>
     <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"/>
+    <alias name="constpointer" target="none" c:type="gconstpointer"/>
+    <alias name="DateYear" target="uint16" c:type="GDateYear"/>
+    <alias name="pointer" target="none" c:type="gpointer"/>
     <callback name="CompareFunc" c:type="GCompareFunc">
       <return-value>
         <type name="int" c:type="gint"/>
@@ -139,6 +137,22 @@
         </parameter>
       </parameters>
     </callback>
+    <union name="DoubleIEEE754" c:type="GDoubleIEEE754">
+      <field name="v_double">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="mpn">
+        <type name="any" c:type="any"/>
+      </field>
+    </union>
+    <union name="FloatIEEE754" c:type="GFloatIEEE754">
+      <field name="v_float">
+        <type name="float" c:type="gfloat"/>
+      </field>
+      <field name="mpn">
+        <type name="any" c:type="any"/>
+      </field>
+    </union>
     <record name="TimeVal" c:type="GTimeVal">
       <field name="tv_sec">
         <type name="long" c:type="glong"/>
@@ -165,7 +179,7 @@
     </record>
     <record name="PtrArray" c:type="GPtrArray">
       <field name="pdata">
-        <type name="pointer" c:type="gpointer*"/>
+        <type name="any" c:type="gpointer*"/>
       </field>
       <field name="len">
         <type name="uint" c:type="guint"/>
@@ -373,7 +387,7 @@
     </function>
     <function name="ptr_array_free" c:identifier="g_ptr_array_free">
       <return-value>
-        <type name="pointer" c:type="gpointer*"/>
+        <type name="any" c:type="gpointer*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -963,18 +977,18 @@
     </function>
     <function name="et_system_data_dirs" c:identifier="g_get_system_data_dirs">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
     </function>
     <function name="et_system_config_dirs"
               c:identifier="g_get_system_config_dirs">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
     </function>
     <function name="et_language_names" c:identifier="g_get_language_names">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
     </function>
     <enumeration name="UserDirectory" c:type="GUserDirectory">
@@ -1113,7 +1127,7 @@
       </return-value>
       <parameters>
         <parameter name="nullify_location">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -1155,7 +1169,7 @@
     </function>
     <function name="listenv" c:identifier="g_listenv">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
     </function>
     <function name="getenv_nomalloc" c:identifier="_g_getenv_nomalloc">
@@ -1167,7 +1181,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="buffer">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -1348,7 +1362,7 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
         <parameter name="oldval">
           <type name="any" c:type="gpointer"/>
@@ -1387,7 +1401,7 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -1397,7 +1411,7 @@
       </return-value>
       <parameters>
         <parameter name="atomic">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
         <parameter name="newval">
           <type name="any" c:type="gpointer"/>
@@ -1789,7 +1803,7 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="StaticMutex" c:type="GStaticMutex*"/>
+          <type name="GStaticMutex" c:type="GStaticMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1799,7 +1813,7 @@
       </return-value>
       <parameters>
         <parameter name="mutex">
-          <type name="StaticMutex" c:type="GStaticMutex*"/>
+          <type name="GStaticMutex" c:type="GStaticMutex*"/>
         </parameter>
       </parameters>
     </function>
@@ -1851,13 +1865,13 @@
     </function>
     <record name="StaticRecMutex" c:type="GStaticRecMutex">
       <field name="mutex">
-        <type name="StaticMutex" c:type="GStaticMutex"/>
+        <type name="GStaticMutex" c:type="GStaticMutex"/>
       </field>
       <field name="depth">
         <type name="uint" c:type="guint"/>
       </field>
       <field name="owner">
-        <type name="SystemThread" c:type="GSystemThread"/>
+        <type name="GSystemThread" c:type="GSystemThread"/>
       </field>
     </record>
     <function name="static_rec_mutex_init"
@@ -1942,7 +1956,7 @@
     </function>
     <record name="StaticRWLock" c:type="GStaticRWLock">
       <field name="mutex">
-        <type name="StaticMutex" c:type="GStaticMutex"/>
+        <type name="GStaticMutex" c:type="GStaticMutex"/>
       </field>
       <field name="read_cond">
         <type name="Cond" c:type="GCond*"/>
@@ -2101,7 +2115,7 @@
       </return-value>
       <parameters>
         <parameter name="value_location">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -2112,7 +2126,7 @@
       </return-value>
       <parameters>
         <parameter name="value_location">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -2122,10 +2136,10 @@
       </return-value>
       <parameters>
         <parameter name="value_location">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="initialization_value">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -2438,14 +2452,14 @@
     </function>
     <function name="base64_encode_step" c:identifier="g_base64_encode_step">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="in">
           <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="break_lines">
           <type name="boolean" c:type="gboolean"/>
@@ -2463,7 +2477,7 @@
     </function>
     <function name="base64_encode_close" c:identifier="g_base64_encode_close">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="break_lines">
@@ -2489,20 +2503,20 @@
           <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
     <function name="base64_decode_step" c:identifier="g_base64_decode_step">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="in">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="out">
           <type name="uchar" c:type="guchar*"/>
@@ -2524,7 +2538,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="out_len">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -2606,7 +2620,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -2626,7 +2640,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="full_path">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -2643,7 +2657,7 @@
           <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -2782,10 +2796,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="groups">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -2829,7 +2843,7 @@
     <function name="bookmark_file_get_groups"
               c:identifier="g_bookmark_file_get_groups">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
@@ -2839,7 +2853,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -2889,7 +2903,7 @@
     <function name="bookmark_file_get_applications"
               c:identifier="g_bookmark_file_get_applications">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
@@ -2899,7 +2913,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -2951,7 +2965,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="exec">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="count">
           <type name="uint" c:type="guint*"/>
@@ -3031,10 +3045,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="href">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="mime_type">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -3171,14 +3185,14 @@
     <function name="bookmark_file_get_uris"
               c:identifier="g_bookmark_file_get_uris">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
           <type name="BookmarkFile" c:type="GBookmarkFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -3265,7 +3279,7 @@
       </return-value>
       <parameters>
         <parameter name="block_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3275,7 +3289,7 @@
       </return-value>
       <parameters>
         <parameter name="block_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3285,7 +3299,7 @@
       </return-value>
       <parameters>
         <parameter name="block_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="mem_block">
           <type name="any" c:type="gconstpointer"/>
@@ -3298,7 +3312,7 @@
       </return-value>
       <parameters>
         <parameter name="block_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="mem_block">
           <type name="any" c:type="gpointer"/>
@@ -3312,13 +3326,13 @@
       </return-value>
       <parameters>
         <parameter name="block_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="mem_chain">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="next_offset">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3389,7 +3403,7 @@
         </return-value>
         <parameters>
           <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
         </parameters>
       </callback>
@@ -3402,7 +3416,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
         </parameters>
       </callback>
@@ -3422,10 +3436,10 @@
         </return-value>
         <parameters>
           <parameter name="n_blocks">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="n_block_bytes">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
         </parameters>
       </callback>
@@ -3435,7 +3449,7 @@
         </return-value>
         <parameters>
           <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
         </parameters>
       </callback>
@@ -3448,7 +3462,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="n_bytes">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
         </parameters>
       </callback>
@@ -3459,7 +3473,7 @@
       </return-value>
       <parameters>
         <parameter name="n_bytes">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3469,7 +3483,7 @@
       </return-value>
       <parameters>
         <parameter name="n_bytes">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3482,7 +3496,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="n_bytes">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3502,7 +3516,7 @@
       </return-value>
       <parameters>
         <parameter name="n_bytes">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3512,7 +3526,7 @@
       </return-value>
       <parameters>
         <parameter name="n_bytes">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3525,7 +3539,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="n_bytes">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -3564,7 +3578,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="area_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="type">
           <type name="int" c:type="gint"/>
@@ -4212,7 +4226,7 @@
     <function name="checksum_type_get_length"
               c:identifier="g_checksum_type_get_length">
       <return-value>
-        <type name="ssize" c:type="gssize"/>
+        <type name="ssize_t" c:type="gssize"/>
       </return-value>
       <parameters>
         <parameter name="checksum_type">
@@ -4262,7 +4276,7 @@
           <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -4288,7 +4302,7 @@
           <type name="uint8" c:type="guint8*"/>
         </parameter>
         <parameter name="digest_len">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -4305,7 +4319,7 @@
           <type name="uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -4322,7 +4336,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -4365,7 +4379,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </callback>
@@ -4430,7 +4444,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="new_prefix">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -4447,7 +4461,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="new_prefix">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -4511,23 +4525,23 @@
     </function>
     <function name="iconv" c:identifier="g_iconv">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="converter">
           <type name="IConv" c:type="GIConv"/>
         </parameter>
         <parameter name="inbuf">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="inbytes_left">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="outbuf">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="outbytes_left">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -4550,7 +4564,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="to_codeset">
           <type name="string" c:type="gchar*"/>
@@ -4559,10 +4573,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4578,16 +4592,16 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="converter">
           <type name="IConv" c:type="GIConv"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4604,7 +4618,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="to_codeset">
           <type name="string" c:type="gchar*"/>
@@ -4616,10 +4630,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4635,13 +4649,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4657,13 +4671,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4679,13 +4693,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4701,13 +4715,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4723,7 +4737,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="hostname">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -4764,7 +4778,7 @@
       </return-value>
       <parameters>
         <parameter name="charsets">
-          <type name="char" c:type="gchar***"/>
+          <type name="int8" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -4782,7 +4796,7 @@
     <function name="uri_list_extract_uris"
               c:identifier="g_uri_list_extract_uris">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="uri_list">
@@ -5615,14 +5629,14 @@
     </function>
     <function name="date_strftime" c:identifier="g_date_strftime">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="s">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="slen">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="format">
           <type name="string" c:type="gchar*"/>
@@ -5759,10 +5773,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="contents">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -5781,7 +5795,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -5820,7 +5834,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="name_used">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -5834,7 +5848,7 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="offset" c:type="goffset"/>
+          <type name="goffset" c:type="goffset"/>
         </parameter>
       </parameters>
     </function>
@@ -5860,7 +5874,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="args">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -5880,20 +5894,20 @@
       </return-value>
       <parameters>
         <parameter name="args">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
     <function name="mkdir_with_parents" c:identifier="g_mkdir_with_parents">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="pathname">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="mode">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -5925,7 +5939,7 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="dummy4">
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </field>
       <field name="dummy5">
         <type name="boolean" c:type="gboolean"/>
@@ -6082,10 +6096,10 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="orig_key">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
         <parameter name="value">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -6210,10 +6224,10 @@
           <type name="HashTableIter" c:type="GHashTableIter*"/>
         </parameter>
         <parameter name="key">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
         <parameter name="value">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -6827,21 +6841,21 @@
     </enumeration>
     <function name="ascii_tolower" c:identifier="g_ascii_tolower">
       <return-value>
-        <type name="char" c:type="gchar"/>
+        <type name="int8" c:type="gchar"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
     <function name="ascii_toupper" c:identifier="g_ascii_toupper">
       <return-value>
-        <type name="char" c:type="gchar"/>
+        <type name="int8" c:type="gchar"/>
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6851,7 +6865,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6861,7 +6875,7 @@
       </return-value>
       <parameters>
         <parameter name="c">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6877,7 +6891,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="new_delimiter">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6893,7 +6907,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="substitutor">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -6929,7 +6943,7 @@
     </function>
     <function name="strlcpy" c:identifier="g_strlcpy">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="dest">
@@ -6939,13 +6953,13 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="dest_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
     <function name="strlcat" c:identifier="g_strlcat">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="dest">
@@ -6955,7 +6969,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="dest_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -6968,7 +6982,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="haystack_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="needle">
           <type name="string" c:type="gchar*"/>
@@ -6997,7 +7011,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="haystack_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="needle">
           <type name="string" c:type="gchar*"/>
@@ -7039,7 +7053,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7052,7 +7066,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7065,7 +7079,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="base">
           <type name="uint" c:type="guint"/>
@@ -7081,7 +7095,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="endptr">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="base">
           <type name="uint" c:type="guint"/>
@@ -7168,7 +7182,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -7181,7 +7195,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -7194,7 +7208,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -7276,7 +7290,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -7286,10 +7300,10 @@
       </return-value>
       <parameters>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="fill_char">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -7351,7 +7365,7 @@
     </function>
     <function name="strsplit" c:identifier="g_strsplit">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -7367,7 +7381,7 @@
     </function>
     <function name="strsplit_set" c:identifier="g_strsplit_set">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -7390,7 +7404,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="str_array">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7400,17 +7414,17 @@
       </return-value>
       <parameters>
         <parameter name="str_array">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
     <function name="strdupv" c:identifier="g_strdupv">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="str_array">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7420,7 +7434,7 @@
       </return-value>
       <parameters>
         <parameter name="str_array">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -7462,7 +7476,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="msgidoffset">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -7920,7 +7934,7 @@
             <type name="SourceFunc" c:type="GSourceFunc*"/>
           </parameter>
           <parameter name="data">
-            <type name="pointer" c:type="gpointer*"/>
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7998,7 +8012,7 @@
       </return-value>
       <parameters>
         <parameter name="pid">
-          <type name="Pid" c:type="GPid"/>
+          <type name="GPid" c:type="GPid"/>
         </parameter>
         <parameter name="status">
           <type name="int" c:type="gint"/>
@@ -8642,7 +8656,7 @@
       </return-value>
       <parameters>
         <parameter name="pid">
-          <type name="Pid" c:type="GPid"/>
+          <type name="GPid" c:type="GPid"/>
         </parameter>
       </parameters>
     </function>
@@ -8799,7 +8813,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="pid">
-          <type name="Pid" c:type="GPid"/>
+          <type name="GPid" c:type="GPid"/>
         </parameter>
         <parameter name="function">
           <type name="ChildWatchFunc" c:type="GChildWatchFunc"/>
@@ -8818,7 +8832,7 @@
       </return-value>
       <parameters>
         <parameter name="pid">
-          <type name="Pid" c:type="GPid"/>
+          <type name="GPid" c:type="GPid"/>
         </parameter>
         <parameter name="function">
           <type name="ChildWatchFunc" c:type="GChildWatchFunc"/>
@@ -9257,7 +9271,7 @@
       </return-value>
       <parameters>
         <parameter name="charset">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
       </parameters>
     </function>
@@ -9523,7 +9537,7 @@
           <type name="unichar" c:type="gunichar*"/>
         </parameter>
         <parameter name="len">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -9537,7 +9551,7 @@
           <type name="unichar" c:type="gunichar"/>
         </parameter>
         <parameter name="result_len">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -9561,7 +9575,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="max_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -9638,7 +9652,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="max">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -9654,7 +9668,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -9667,7 +9681,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="c">
           <type name="unichar" c:type="gunichar"/>
@@ -9683,7 +9697,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="c">
           <type name="unichar" c:type="gunichar"/>
@@ -9699,7 +9713,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -9873,10 +9887,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="max_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="end">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -9899,7 +9913,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -9912,7 +9926,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -9925,7 +9939,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -9952,7 +9966,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="mode">
           <type name="NormalizeMode" c:type="GNormalizeMode"/>
@@ -9981,7 +9995,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -9995,7 +10009,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10038,10 +10052,10 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="len">
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </field>
       <field name="allocated_len">
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </field>
     </record>
     <record name="StringChunk" c:type="GStringChunk"/>
@@ -10051,7 +10065,7 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -10101,7 +10115,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10138,7 +10152,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10148,7 +10162,7 @@
       </return-value>
       <parameters>
         <parameter name="dfl_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -10210,7 +10224,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="len">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -10223,7 +10237,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="len">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -10236,13 +10250,13 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10271,7 +10285,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10284,7 +10298,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="c">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -10324,7 +10338,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="c">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -10354,7 +10368,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10367,7 +10381,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
@@ -10383,10 +10397,10 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="c">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -10400,7 +10414,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="wc">
           <type name="unichar" c:type="gunichar"/>
@@ -10416,7 +10430,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
@@ -10433,13 +10447,13 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="val">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10452,10 +10466,10 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="pos">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -10569,7 +10583,7 @@
         <type name="uint" c:type="guint"/>
       </field>
       <field name="buf_size">
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </field>
       <field name="read_buf">
         <type name="String" c:type="GString*"/>
@@ -10581,7 +10595,7 @@
         <type name="String" c:type="GString*"/>
       </field>
       <field name="partial_write_buf">
-        <type name="char" c:type="gchar"/>
+        <type name="int8" c:type="gchar"/>
       </field>
       <field name="use_buffer">
         <type name="uint" c:type="guint"/>
@@ -10621,10 +10635,10 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_read">
-            <type name="size" c:type="gsize*"/>
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
           <parameter name="err">
             <type name="Error" c:type="GError**"/>
@@ -10643,10 +10657,10 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_written">
-            <type name="size" c:type="gsize*"/>
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
           <parameter name="err">
             <type name="Error" c:type="GError**"/>
@@ -10849,10 +10863,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="count">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -10868,10 +10882,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="count">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
@@ -10984,14 +10998,14 @@
           <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
     <function name="io_channel_get_buffer_size"
               c:identifier="g_io_channel_get_buffer_size">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="channel">
@@ -11170,13 +11184,13 @@
           <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="str_return">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="terminator_pos">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11196,7 +11210,7 @@
           <type name="String" c:type="GString*"/>
         </parameter>
         <parameter name="terminator_pos">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11213,10 +11227,10 @@
           <type name="IOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="str_return">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11236,10 +11250,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="count">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="bytes_read">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11276,10 +11290,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="count">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="bytes_written">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11362,7 +11376,7 @@
       </return-value>
       <parameters>
         <parameter name="fd">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -11436,7 +11450,7 @@
           <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="separator">
-          <type name="char" c:type="gchar"/>
+          <type name="int8" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -11473,7 +11487,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="flags">
           <type name="KeyFileFlags" c:type="GKeyFileFlags"/>
@@ -11496,10 +11510,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="search_dirs">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="full_path">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
           <type name="KeyFileFlags" c:type="GKeyFileFlags"/>
@@ -11522,7 +11536,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="full_path">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
           <type name="KeyFileFlags" c:type="GKeyFileFlags"/>
@@ -11541,7 +11555,7 @@
           <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11561,20 +11575,20 @@
     </function>
     <function name="key_file_get_groups" c:identifier="g_key_file_get_groups">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
           <type name="KeyFile" c:type="GKeyFile*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
     <function name="key_file_get_keys" c:identifier="g_key_file_get_keys">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11584,7 +11598,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11866,7 +11880,7 @@
     <function name="key_file_get_string_list"
               c:identifier="g_key_file_get_string_list">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11879,7 +11893,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11905,14 +11919,14 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
     <function name="key_file_get_locale_string_list"
               c:identifier="g_key_file_get_locale_string_list">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11928,7 +11942,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -11957,7 +11971,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -11977,7 +11991,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -12003,7 +12017,7 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -12023,7 +12037,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -12049,7 +12063,7 @@
           <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -12069,7 +12083,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -12095,7 +12109,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -12218,7 +12232,7 @@
     <function name="mapped_file_get_length"
               c:identifier="g_mapped_file_get_length">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="file">
@@ -12296,10 +12310,10 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="attribute_names">
-            <type name="char" c:type="gchar**"/>
+            <type name="int8" c:type="gchar**"/>
           </parameter>
           <parameter name="attribute_values">
-            <type name="char" c:type="gchar**"/>
+            <type name="int8" c:type="gchar**"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -12340,7 +12354,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="text_len">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -12362,7 +12376,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="text_len">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -12433,7 +12447,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="text_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -12502,7 +12516,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
       </parameters>
     </function>
@@ -12543,10 +12557,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="attribute_names">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="attribute_values">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -12745,7 +12759,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="line">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="string" c:type="char*"/>
@@ -12767,7 +12781,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="line">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="pretty_function">
           <type name="string" c:type="char*"/>
@@ -13263,7 +13277,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="short_name">
-        <type name="char" c:type="gchar"/>
+        <type name="int8" c:type="gchar"/>
       </field>
       <field name="flags">
         <type name="int" c:type="gint"/>
@@ -13530,7 +13544,7 @@
           <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
-          <type name="char" c:type="gchar***"/>
+          <type name="int8" c:type="gchar***"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -13865,7 +13879,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="compare_func">
           <type name="CompareDataFunc" c:type="GCompareDataFunc"/>
@@ -14892,7 +14906,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="string_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
           <type name="int" c:type="gint"/>
@@ -14940,7 +14954,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="string_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
           <type name="int" c:type="gint"/>
@@ -14958,7 +14972,7 @@
     </function>
     <function name="regex_split_simple" c:identifier="g_regex_split_simple">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -14977,7 +14991,7 @@
     </function>
     <function name="regex_split" c:identifier="g_regex_split">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="regex">
@@ -14993,7 +15007,7 @@
     </function>
     <function name="regex_split_full" c:identifier="g_regex_split_full">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="regex">
@@ -15003,7 +15017,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="string_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
           <type name="int" c:type="gint"/>
@@ -15031,7 +15045,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="string_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
           <type name="int" c:type="gint"/>
@@ -15060,7 +15074,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="string_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
           <type name="int" c:type="gint"/>
@@ -15088,7 +15102,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="string_len">
-          <type name="ssize" c:type="gssize"/>
+          <type name="ssize_t" c:type="gssize"/>
         </parameter>
         <parameter name="start_position">
           <type name="int" c:type="gint"/>
@@ -15288,7 +15302,7 @@
     <function name="match_info_fetch_all"
               c:identifier="g_match_info_fetch_all">
       <return-value>
-        <type name="char" c:type="gchar**"/>
+        <type name="int8" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="match_info">
@@ -15593,6 +15607,44 @@
         <type name="uint" c:type="guint"/>
       </field>
     </record>
+    <union name="TokenValue" c:type="GTokenValue">
+      <field name="v_symbol">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="v_identifier">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="v_binary">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="v_octal">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="v_int">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="v_int64">
+        <type name="uint64" c:type="guint64"/>
+      </field>
+      <field name="v_float">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="v_hex">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="v_string">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="v_comment">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="v_char">
+        <type name="uchar" c:type="guchar"/>
+      </field>
+      <field name="v_error">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </union>
     <callback name="ScannerMsgFunc" c:type="GScannerMsgFunc">
       <return-value>
         <type name="none" c:type="void"/>
@@ -16499,7 +16551,7 @@
           <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="argvp">
-          <type name="char" c:type="gchar***"/>
+          <type name="int8" c:type="gchar***"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -16575,10 +16627,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="envp">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
           <type name="SpawnFlags" c:type="GSpawnFlags"/>
@@ -16590,7 +16642,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
-          <type name="Pid" c:type="GPid*"/>
+          <type name="GPid" c:type="GPid*"/>
         </parameter>
         <parameter name="error">
           <type name="Error" c:type="GError**"/>
@@ -16607,10 +16659,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="envp">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
           <type name="SpawnFlags" c:type="GSpawnFlags"/>
@@ -16622,7 +16674,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
-          <type name="Pid" c:type="GPid*"/>
+          <type name="GPid" c:type="GPid*"/>
         </parameter>
         <parameter name="standard_input">
           <type name="int" c:type="gint*"/>
@@ -16647,10 +16699,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="envp">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
           <type name="SpawnFlags" c:type="GSpawnFlags"/>
@@ -16662,10 +16714,10 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="standard_output">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="standard_error">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="exit_status">
           <type name="int" c:type="gint*"/>
@@ -16685,10 +16737,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="standard_output">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="standard_error">
-          <type name="char" c:type="gchar**"/>
+          <type name="int8" c:type="gchar**"/>
         </parameter>
         <parameter name="exit_status">
           <type name="int" c:type="gint*"/>
@@ -16718,26 +16770,26 @@
       </return-value>
       <parameters>
         <parameter name="pid">
-          <type name="Pid" c:type="GPid"/>
+          <type name="GPid" c:type="GPid"/>
         </parameter>
       </parameters>
     </function>
     <function name="access" c:identifier="g_access">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="filename">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="mode">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="chdir" c:identifier="g_chdir">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="path">
@@ -16747,7 +16799,7 @@
     </function>
     <function name="unlink" c:identifier="g_unlink">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="filename">
@@ -16757,7 +16809,7 @@
     </function>
     <function name="rmdir" c:identifier="g_rmdir">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="filename">
@@ -17212,10 +17264,10 @@
           <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="orig_key">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
         <parameter name="value">
-          <type name="pointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
@@ -17350,7 +17402,7 @@
     <record name="TestSuite" c:type="GTestSuite"/>
     <function name="strcmp0" c:identifier="g_strcmp0">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="str1">
@@ -17398,13 +17450,13 @@
           <type name="int" c:type="int*"/>
         </parameter>
         <parameter name="argv">
-          <type name="char" c:type="char***"/>
+          <type name="int8" c:type="char***"/>
         </parameter>
       </parameters>
     </function>
     <function name="test_run" c:identifier="g_test_run">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
     </function>
     <function name="test_add_func" c:identifier="g_test_add_func">
@@ -17586,7 +17638,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="data_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="test_data">
           <type name="any" c:type="gconstpointer"/>
@@ -17646,7 +17698,7 @@
     </function>
     <function name="test_run_suite" c:identifier="g_test_run_suite">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="suite">
@@ -17667,7 +17719,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="line">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="string" c:type="char*"/>
@@ -17692,7 +17744,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="line">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="string" c:type="char*"/>
@@ -17715,7 +17767,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="line">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="string" c:type="char*"/>
@@ -17738,7 +17790,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="line">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="string" c:type="char*"/>
@@ -17770,7 +17822,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="line">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="string" c:type="char*"/>
@@ -17788,7 +17840,7 @@
           <type name="long" c:type="long"/>
         </parameter>
         <parameter name="numtype">
-          <type name="char" c:type="char"/>
+          <type name="int8" c:type="char"/>
         </parameter>
       </parameters>
     </function>
@@ -17801,7 +17853,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="data_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="test_data">
           <type name="any" c:type="gconstpointer"/>

diff --git a/gir/gobject-2.0-good.gir b/gir/gobject-2.0-good.gir
index f3001a1..41ecea3 100644 (file)
--- a/gir/gobject-2.0-good.gir
+++ b/gir/gobject-2.0-good.gir
@@ -3,12 +3,13 @@
             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="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"
+    <alias name="chararray" target="none" c:type="gchararray"/>
+    <alias name="Type" target="size" c:type="GType"/>
+    <alias name="Strv" target="none" c:type="GStrv"/>
+    <glib:boxed c:type="GValue"
                 glib:name="Value"
                 glib:type-name="GValue"
                 glib:get-type="g_value_get_type">
@@ -292,13 +293,13 @@
             <type name="Value" c:type="GValue*"/>
           </parameter>
           <parameter name="v_char">
-            <type name="char" c:type="gchar"/>
+            <type name="GLib.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"/>
+          <type name="GLib.char" c:type="gchar"/>
         </return-value>
         <parameters>
           <parameter name="value">
@@ -315,13 +316,13 @@
             <type name="Value" c:type="GValue*"/>
           </parameter>
           <parameter name="v_uchar">
-            <type name="uchar" c:type="guchar"/>
+            <type name="GLib.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"/>
+          <type name="GLib.uchar" c:type="guchar"/>
         </return-value>
         <parameters>
           <parameter name="value">
@@ -657,6 +658,23 @@
         </parameters>
       </method>
     </glib:boxed>
+    <union name="TypeCValue" c:type="GTypeCValue">
+      <field name="v_int">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="v_long">
+        <type name="long" c:type="glong"/>
+      </field>
+      <field name="v_int64">
+        <type name="int64" c:type="gint64"/>
+      </field>
+      <field name="v_double">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="v_pointer">
+        <type name="any" c:type="gpointer"/>
+      </field>
+    </union>
     <interface name="TypePlugin"
                c:type="GTypePlugin"
                glib:type-name="GTypePlugin"
@@ -879,7 +897,7 @@
     </function>
     <function name="type_qname" c:identifier="g_type_qname">
       <return-value>
-        <type name="Quark" c:type="GQuark"/>
+        <type name="GLib.Quark" c:type="GQuark"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -1087,7 +1105,7 @@
           <type name="Type" c:type="GType"/>
         </parameter>
         <parameter name="quark">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -1103,7 +1121,7 @@
           <type name="Type" c:type="GType"/>
         </parameter>
         <parameter name="quark">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -1413,7 +1431,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="private_size">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
       </parameters>
     </function>
@@ -1892,7 +1910,7 @@
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="Closure"
+    <glib:boxed c:type="GClosure"
                 glib:name="Closure"
                 glib:type-name="GClosure"
                 glib:get-type="g_closure_get_type">
@@ -2106,7 +2124,7 @@
         </parameters>
       </method>
     </glib:boxed>
-    <glib:boxed c:type="ValueArray"
+    <glib:boxed c:type="GValueArray"
                 glib:name="ValueArray"
                 glib:type-name="GValueArray"
                 glib:get-type="g_value_array_get_type">
@@ -2226,27 +2244,27 @@
         </parameters>
       </method>
     </glib:boxed>
-    <glib:boxed c:type="Date"
+    <glib:boxed c:type="GDate"
                 glib:name="Date"
                 glib:type-name="GDate"
                 glib:get-type="g_date_get_type">
     </glib:boxed>
-    <glib:boxed c:type="Strv"
+    <glib:boxed c:type="GStrv"
                 glib:name="Strv"
                 glib:type-name="GStrv"
                 glib:get-type="g_strv_get_type">
     </glib:boxed>
-    <glib:boxed c:type="String"
+    <glib:boxed c:type="GString"
                 glib:name="String"
                 glib:type-name="GString"
                 glib:get-type="g_gstring_get_type">
     </glib:boxed>
-    <glib:boxed c:type="HashTable"
+    <glib:boxed c:type="GHashTable"
                 glib:name="HashTable"
                 glib:type-name="GHashTable"
                 glib:get-type="g_hash_table_get_type">
     </glib:boxed>
-    <glib:boxed c:type="Regex"
+    <glib:boxed c:type="GRegex"
                 glib:name="Regex"
                 glib:type-name="GRegex"
                 glib:get-type="g_regex_get_type">
@@ -3303,7 +3321,7 @@
           <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="quark">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3317,7 +3335,7 @@
           <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="quark">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3334,7 +3352,7 @@
           <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="quark">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3354,7 +3372,7 @@
           <type name="ParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="quark">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3723,7 +3741,7 @@
         <type name="uint" c:type="guint"/>
       </field>
       <field name="detail">
-        <type name="Quark" c:type="GQuark"/>
+        <type name="GLib.Quark" c:type="GQuark"/>
       </field>
       <field name="run_type">
         <type name="SignalFlags" c:type="GSignalFlags"/>
@@ -3873,7 +3891,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="return_value">
           <type name="Value" c:type="GValue*"/>
@@ -3892,7 +3910,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3973,7 +3991,7 @@
           <type name="uint" c:type="guint*"/>
         </parameter>
         <parameter name="detail_p">
-          <type name="Quark" c:type="GQuark*"/>
+          <type name="GLib.Quark" c:type="GQuark*"/>
         </parameter>
         <parameter name="force_detail_quark">
           <type name="boolean" c:type="gboolean"/>
@@ -4004,7 +4022,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -4032,7 +4050,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="hook_func">
           <type name="SignalEmissionHook" c:type="GSignalEmissionHook"/>
@@ -4072,7 +4090,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="may_be_blocked">
           <type name="boolean" c:type="gboolean"/>
@@ -4092,7 +4110,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="closure">
           <type name="Closure" c:type="GClosure*"/>
@@ -4218,7 +4236,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="closure">
           <type name="Closure" c:type="GClosure*"/>
@@ -4247,7 +4265,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="closure">
           <type name="Closure" c:type="GClosure*"/>
@@ -4276,7 +4294,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="closure">
           <type name="Closure" c:type="GClosure*"/>
@@ -4305,7 +4323,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="detail">
-          <type name="Quark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
         <parameter name="closure">
           <type name="Closure" c:type="GClosure*"/>
@@ -4500,7 +4518,7 @@
             <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="weak_pointer_location">
-            <type name="pointer" c:type="gpointer*"/>
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </method>
@@ -4514,7 +4532,7 @@
             <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="weak_pointer_location">
-            <type name="pointer" c:type="gpointer*"/>
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </method>
@@ -4560,7 +4578,7 @@
             <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="quark">
-            <type name="Quark" c:type="GQuark"/>
+            <type name="GLib.Quark" c:type="GQuark"/>
           </parameter>
         </parameters>
       </method>
@@ -4573,7 +4591,7 @@
             <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="quark">
-            <type name="Quark" c:type="GQuark"/>
+            <type name="GLib.Quark" c:type="GQuark"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
@@ -4589,7 +4607,7 @@
             <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="quark">
-            <type name="Quark" c:type="GQuark"/>
+            <type name="GLib.Quark" c:type="GQuark"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
@@ -4608,7 +4626,7 @@
             <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="quark">
-            <type name="Quark" c:type="GQuark"/>
+            <type name="GLib.Quark" c:type="GQuark"/>
           </parameter>
         </parameters>
       </method>
@@ -4706,6 +4724,21 @@
           </parameter>
         </parameters>
       </method>
+      <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>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="Class" c:type="GObjectClass">
+      <field name="g_type_class">
+        <type name="TypeClass" c:type="GTypeClass"/>
+      </field>
       <field name="construct_properties">
         <type name="GLib.SList" c:type="GSList*"/>
       </field>
@@ -4826,24 +4859,15 @@
       <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="Param" c:type="GParam"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
+    </record>
     <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">
+    <record name="InitiallyUnownedClass" c:type="GInitiallyUnownedClass"/>
+    <record name="ConstructParam" c:type="GObjectConstructParam">
       <field name="pspec">
         <type name="ParamSpec" c:type="GParamSpec*"/>
       </field>
@@ -5206,11 +5230,11 @@
     <function name="object_compat_control"
               c:identifier="g_object_compat_control">
       <return-value>
-        <type name="size" c:type="gsize"/>
+        <type name="size_t" c:type="gsize"/>
       </return-value>
       <parameters>
         <parameter name="what">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -5342,7 +5366,7 @@
         <type name="ParamSpec" c:type="GParamSpec"/>
       </field>
       <field name="default_value">
-        <type name="unichar" c:type="gunichar"/>
+        <type name="GLib.unichar" c:type="gunichar"/>
       </field>
     </record>
     <record name="ParamSpecEnum" c:type="GParamSpecEnum">
@@ -5415,7 +5439,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="substitutor">
-        <type name="char" c:type="gchar"/>
+        <type name="GLib.char" c:type="gchar"/>
       </field>
       <field name="null_fold_if_empty">
         <type name="uint" c:type="guint"/>
@@ -5732,7 +5756,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="default_value">
-          <type name="unichar" c:type="gunichar"/>
+          <type name="GLib.unichar" c:type="gunichar"/>
         </parameter>
         <parameter name="flags">
           <type name="ParamFlags" c:type="GParamFlags"/>
@@ -6023,7 +6047,7 @@
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="IOChannel"
+    <glib:boxed c:type="GIOChannel"
                 glib:name="IOChannel"
                 glib:type-name="GIOChannel"
                 glib:get-type="g_io_channel_get_type">
@@ -6195,6 +6219,70 @@
         </return-value>
       </callback>
     </class>
+    <record name="TypeModuleClass" c:type="GTypeModuleClass">
+      <field name="parent_class">
+        <type name="Class" c:type="GObjectClass"/>
+      </field>
+      <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>
+    </record>
+    <record name="TypePluginClass" c:type="GTypePluginClass">
+      <field name="base_iface">
+        <type name="TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <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>
+    </record>
     <callback name="TypePluginUse" c:type="GTypePluginUse">
       <return-value>
         <type name="none" c:type="void"/>

diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py
index 266f503..e56b6a5 100644 (file)
--- a/giscanner/glibtransformer.py
+++ b/giscanner/glibtransformer.py
@@ -322,7 +322,6 @@ class GLibTransformer(object):
         pair_class = self._get_attribute(resolved)
         if pair_class and isinstance(pair_class,
                                      (GLibObject, GLibBoxed, GLibInterface)):
-            del self._names.names[maybe_class.name]
             for field in maybe_class.fields[1:]:
                 pair_class.fields.append(field)
             return

diff --git a/tests/scanner/drawable-expected.gir b/tests/scanner/drawable-expected.gir
index b61b11b..c6c2997 100644 (file)
--- a/tests/scanner/drawable-expected.gir
+++ b/tests/scanner/drawable-expected.gir
@@ -9,6 +9,11 @@
            glib:type-name="TestDrawable"
            glib:get-type="test_drawable_get_type">
     </class>
+    <record name="DrawableClass" c:type="TestDrawableClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
     <record name="PixmapObjectClass" c:type="_TestPixmapObjectClass">
       <field name="parent_class">
         <type name="DrawableClass" c:type="TestDrawableClass"/>

diff --git a/tests/scanner/foo-expected.gir b/tests/scanner/foo-expected.gir
index 23f91fd..5599036 100644 (file)
--- a/tests/scanner/foo-expected.gir
+++ b/tests/scanner/foo-expected.gir
@@ -10,6 +10,11 @@
                glib:type-name="FooInterface"
                glib:get-type="foo_interface_get_type">
     </interface>
+    <record name="InterfaceIface" c:type="FooInterfaceIface">
+      <field name="parent_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+    </record>
     <class name="Object"
            c:type="FooObject"
            parent="GObject.Object"
@@ -89,6 +94,24 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ObjectClass" c:type="FooObjectClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="virtual_method" c:type="virtual_method">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="FooObject*"/>
+          </parameter>
+          <parameter name="first_param">
+            <type name="int" c:type="int"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <class name="Subobject"
            c:type="FooSubobject"
            parent="Object"
@@ -100,6 +123,11 @@
         </return-value>
       </constructor>
     </class>
+    <record name="SubobjectClass" c:type="FooSubobjectClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="FooObjectClass"/>
+      </field>
+    </record>
     <function name="init" c:identifier="foo_init">
       <return-value>
         <type name="int" c:type="gint"/>

diff --git a/tests/scanner/utility-expected.gir b/tests/scanner/utility-expected.gir
index cef0c4b..292473a 100644 (file)
--- a/tests/scanner/utility-expected.gir
+++ b/tests/scanner/utility-expected.gir
@@ -9,6 +9,11 @@
            glib:type-name="UtilityObject"
            glib:get-type="utility_object_get_type">
     </class>
+    <record name="ObjectClass" c:type="UtilityObjectClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
     <enumeration name="EnumType" c:type="UtilityEnumType">
       <member name="a" value="0" c:identifier="UTILITY_ENUM_A"/>
       <member name="b" value="1" c:identifier="UTILITY_ENUM_B"/>