--- Gio-2.0-master.gir	2015-09-02 15:19:24.453908016 +0100
+++ Gio-2.0-nullability.gir	2015-09-02 15:22:45.293205282 +0100
@@ -1035,7 +1035,11 @@
             <parameter name="parameter" transfer-ownership="none">
               <type name="GLib.Variant" c:type="GVariant*"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="2">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="2">
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
           </parameters>
@@ -1067,7 +1071,11 @@
             <parameter name="value" transfer-ownership="none">
               <type name="GLib.Variant" c:type="GVariant*"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="2">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="2">
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
           </parameters>
@@ -2657,7 +2665,10 @@
             <doc xml:space="preserve">the length of @entries, or -1 if @entries is %NULL-terminated</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">the user data for signal connections</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -7475,7 +7486,11 @@
     finished</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -7543,7 +7558,11 @@
     finished</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -7595,7 +7614,11 @@
     finished</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -7663,7 +7686,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -7755,7 +7782,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -7846,7 +7877,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -7888,7 +7923,11 @@
           <doc xml:space="preserve">a #GAsyncResult.</doc>
           <type name="AsyncResult" c:type="GAsyncResult*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">user data passed to the callback.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -7997,7 +8036,7 @@
       </virtual-method>
       <virtual-method name="get_user_data" invoker="get_user_data">
         <doc xml:space="preserve">Gets the user data from a #GAsyncResult.</doc>
-        <return-value transfer-ownership="full">
+        <return-value transfer-ownership="full" nullable="1">
           <doc xml:space="preserve">the user data for @res.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -8021,7 +8060,10 @@
             <doc xml:space="preserve">a #GAsyncResult</doc>
             <type name="AsyncResult" c:type="GAsyncResult*"/>
           </instance-parameter>
-          <parameter name="source_tag" transfer-ownership="none">
+          <parameter name="source_tag"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">an application-defined tag</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -8044,7 +8086,7 @@
       </method>
       <method name="get_user_data" c:identifier="g_async_result_get_user_data">
         <doc xml:space="preserve">Gets the user data from a #GAsyncResult.</doc>
-        <return-value transfer-ownership="full">
+        <return-value transfer-ownership="full" nullable="1">
           <doc xml:space="preserve">the user data for @res.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -8070,7 +8112,10 @@
             <doc xml:space="preserve">a #GAsyncResult</doc>
             <type name="AsyncResult" c:type="GAsyncResult*"/>
           </instance-parameter>
-          <parameter name="source_tag" transfer-ownership="none">
+          <parameter name="source_tag"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">an application-defined tag</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -8113,7 +8158,7 @@
       </field>
       <field name="get_user_data">
         <callback name="get_user_data">
-          <return-value transfer-ownership="full">
+          <return-value transfer-ownership="full" nullable="1">
             <doc xml:space="preserve">the user data for @res.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </return-value>
@@ -8152,7 +8197,10 @@
               <doc xml:space="preserve">a #GAsyncResult</doc>
               <type name="AsyncResult" c:type="GAsyncResult*"/>
             </parameter>
-            <parameter name="source_tag" transfer-ownership="none">
+            <parameter name="source_tag"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1">
               <doc xml:space="preserve">an application-defined tag</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -8302,7 +8350,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">a #gpointer</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -8415,7 +8467,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">a #gpointer</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -8656,7 +8712,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">a #gpointer</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -8899,7 +8959,11 @@
           <doc xml:space="preserve">The name that is requested to be owned.</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">User data passed to g_bus_own_name().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -8921,7 +8985,11 @@
           <doc xml:space="preserve">The name being owned.</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">User data passed to g_bus_own_name() or g_bus_own_name_on_connection().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -8947,7 +9015,11 @@
           <doc xml:space="preserve">Unique name of the owner of the name being watched.</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="3">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="3">
           <doc xml:space="preserve">User data passed to g_bus_watch_name().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -8970,7 +9042,11 @@
           <doc xml:space="preserve">The name being owned.</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">User data passed to g_bus_own_name() or g_bus_own_name_on_connection().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -9023,7 +9099,11 @@
           <doc xml:space="preserve">The name being watched.</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">User data passed to g_bus_watch_name().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -9245,7 +9325,11 @@
             <doc xml:space="preserve">The #GCallback to connect.</doc>
             <type name="GObject.Callback" c:type="GCallback"/>
           </parameter>
-          <parameter name="data" transfer-ownership="none">
+          <parameter name="data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="1">
             <doc xml:space="preserve">Data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -9654,7 +9738,11 @@
           <doc xml:space="preserve">the #GCancellable</doc>
           <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="1">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="1">
           <doc xml:space="preserve">data passed in by the user.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -9874,7 +9962,10 @@
             <doc xml:space="preserve">a #GConverter.</doc>
             <type name="Converter" c:type="GConverter*"/>
           </instance-parameter>
-          <parameter name="inbuf" transfer-ownership="none">
+          <parameter name="inbuf"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">the buffer
         containing the data to convert.</doc>
             <array length="1" zero-terminated="0" c:type="void*">
@@ -10123,7 +10214,10 @@
               <doc xml:space="preserve">a #GConverter.</doc>
               <type name="Converter" c:type="GConverter*"/>
             </parameter>
-            <parameter name="inbuf" transfer-ownership="none">
+            <parameter name="inbuf"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1">
               <doc xml:space="preserve">the buffer
         containing the data to convert.</doc>
               <array length="2" zero-terminated="0" c:type="void*">
@@ -10478,7 +10572,7 @@
 It is a programming error (which will cause an warning to be
 logged) to use this method if there is no #GCredentials support for
 the OS or if @native_type isn't supported by the OS.</doc>
-        <return-value>
+        <return-value nullable="1">
           <doc xml:space="preserve">The pointer to native credentials or %NULL if the
 operation there is no #GCredentials support for the OS or if
 @native_type isn't supported by the OS. Do not free the returned
@@ -11309,7 +11403,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -11373,7 +11471,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -11428,7 +11530,11 @@
             <type name="DBusMessageFilterFunction"
                   c:type="GDBusMessageFilterFunction"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="1">
             <doc xml:space="preserve">user data to pass to @filter_function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -11555,7 +11661,11 @@
     method invocation</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="10">
             <doc xml:space="preserve">the data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -11768,7 +11878,11 @@
     method invocation</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="11">
             <doc xml:space="preserve">The data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -11943,7 +12057,11 @@
     satisfied or %NULL if you don't care about the result</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">The data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -12165,7 +12283,11 @@
     request is satisfied or %NULL if you don't care about the result</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">The data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -12558,7 +12680,10 @@
             <doc xml:space="preserve">flags used to fine tune the behavior of the subtree</doc>
             <type name="DBusSubtreeFlags" c:type="GDBusSubtreeFlags"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">data to pass to functions in @vtable</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -12726,7 +12851,11 @@
     is satisfied or %NULL if you don't care about the result</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">The data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -12955,7 +13084,11 @@
             <doc xml:space="preserve">callback to invoke when there is a signal matching the requested data</doc>
             <type name="DBusSignalCallback" c:type="GDBusSignalCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="7">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -14036,7 +14169,11 @@
           <doc xml:space="preserve">Return location for error.</doc>
           <type name="GLib.Error" c:type="GError**"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="6">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="6">
           <doc xml:space="preserve">The @user_data #gpointer passed to g_dbus_connection_register_object().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -14359,7 +14496,11 @@
           <doc xml:space="preserve">A #GDBusMethodInvocation object that must be used to return a value or error.</doc>
           <type name="DBusMethodInvocation" c:type="GDBusMethodInvocation*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="7">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="7">
           <doc xml:space="preserve">The @user_data #gpointer passed to g_dbus_connection_register_object().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -14402,7 +14543,11 @@
           <doc xml:space="preserve">Return location for error.</doc>
           <type name="GLib.Error" c:type="GError**"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="7">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="7">
           <doc xml:space="preserve">The @user_data #gpointer passed to g_dbus_connection_register_object().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -16134,7 +16279,11 @@
 a message to be sent to the other peer.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="3">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="3">
           <doc xml:space="preserve">User data passed when adding the filter.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -16524,7 +16673,7 @@
               version="2.26"
               introspectable="0">
         <doc xml:space="preserve">Gets the @user_data #gpointer passed to g_dbus_connection_register_object().</doc>
-        <return-value>
+        <return-value nullable="1">
           <doc xml:space="preserve">A #gpointer.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -17622,7 +17771,11 @@
             <doc xml:space="preserve">A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.</doc>
             <type name="DBusProxyTypeFunc" c:type="GDBusProxyTypeFunc"/>
           </parameter>
-          <parameter name="get_proxy_type_user_data" transfer-ownership="none">
+          <parameter name="get_proxy_type_user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">User data to pass to @get_proxy_type_func.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -17689,7 +17842,11 @@
             <doc xml:space="preserve">A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.</doc>
             <type name="DBusProxyTypeFunc" c:type="GDBusProxyTypeFunc"/>
           </parameter>
-          <parameter name="get_proxy_type_user_data" transfer-ownership="none">
+          <parameter name="get_proxy_type_user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">User data to pass to @get_proxy_type_func.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -17752,7 +17909,11 @@
             <doc xml:space="preserve">A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.</doc>
             <type name="DBusProxyTypeFunc" c:type="GDBusProxyTypeFunc"/>
           </parameter>
-          <parameter name="get_proxy_type_user_data" transfer-ownership="none">
+          <parameter name="get_proxy_type_user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">User data to pass to @get_proxy_type_func.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -17780,7 +17941,11 @@
             <doc xml:space="preserve">A #GAsyncReadyCallback to call when the request is satisfied.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="9">
             <doc xml:space="preserve">The data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -17829,7 +17994,11 @@
             <doc xml:space="preserve">A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.</doc>
             <type name="DBusProxyTypeFunc" c:type="GDBusProxyTypeFunc"/>
           </parameter>
-          <parameter name="get_proxy_type_user_data" transfer-ownership="none">
+          <parameter name="get_proxy_type_user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">User data to pass to @get_proxy_type_func.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -17857,7 +18026,11 @@
             <doc xml:space="preserve">A #GAsyncReadyCallback to call when the request is satisfied.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="9">
             <doc xml:space="preserve">The data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -19278,7 +19451,11 @@
             <doc xml:space="preserve">Callback function to invoke when the proxy is ready.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="8">
             <doc xml:space="preserve">User data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -19337,7 +19514,11 @@
             <doc xml:space="preserve">Callback function to invoke when the proxy is ready.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="8">
             <doc xml:space="preserve">User data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -19466,7 +19647,11 @@
 care about the result of the method invocation.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">The data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -19629,7 +19814,11 @@
 care about the result of the method invocation.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="7">
             <doc xml:space="preserve">The data to pass to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -20303,7 +20492,11 @@
           <doc xml:space="preserve">The interface name of the remote object or %NULL if a #GDBusObjectProxy #GType is requested.</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="3">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="3">
           <doc xml:space="preserve">User data.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -20624,7 +20817,11 @@
           <doc xml:space="preserve">A #GVariant tuple with parameters for the signal.</doc>
           <type name="GLib.Variant" c:type="GVariant*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="6">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="6">
           <doc xml:space="preserve">User data passed when subscribing to the signal.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -20760,7 +20957,11 @@
           <doc xml:space="preserve">Return location for user data to pass to functions in the returned #GDBusInterfaceVTable (never %NULL).</doc>
           <type name="gpointer" c:type="gpointer*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="6">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="6">
           <doc xml:space="preserve">The @user_data #gpointer passed to g_dbus_connection_register_subtree().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -20800,7 +21001,11 @@
           <doc xml:space="preserve">The object path that was registered with g_dbus_connection_register_subtree().</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="3">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="3">
           <doc xml:space="preserve">The @user_data #gpointer passed to g_dbus_connection_register_subtree().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -20869,7 +21074,11 @@
           <doc xml:space="preserve">A node that is a child of @object_path (relative to @object_path) or %NULL for the root of the subtree.</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="4">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="4">
           <doc xml:space="preserve">The @user_data #gpointer passed to g_dbus_connection_register_subtree().</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -21146,7 +21355,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -21444,7 +21657,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -21586,7 +21803,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -22573,7 +22794,7 @@
                      transfer-ownership="none"
                      nullable="1"
                      allow-none="1"
-                     closure="3">
+                     closure="4">
             <doc xml:space="preserve">User data for @user_setup</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -22591,7 +22812,7 @@
                      transfer-ownership="none"
                      nullable="1"
                      allow-none="1"
-                     closure="5">
+                     closure="6">
             <doc xml:space="preserve">User data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -22741,7 +22962,11 @@
           <doc xml:space="preserve">Process identifier</doc>
           <type name="GLib.Pid" c:type="GPid"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">User data</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -22905,7 +23130,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -22986,7 +23215,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23230,7 +23463,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="2">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23298,7 +23535,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23367,7 +23608,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23511,7 +23756,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23582,7 +23831,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23827,7 +24080,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23895,7 +24152,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -23964,7 +24225,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -24227,7 +24492,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">user data to pass to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -24279,7 +24548,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="3">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="3">
               <doc xml:space="preserve">user data to pass to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -24423,7 +24696,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data to pass to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -24501,7 +24778,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data to pass to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -24577,7 +24858,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data passed to @callback.</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -25947,7 +26232,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26047,7 +26336,11 @@
     progress information, or %NULL if progress information is not needed</doc>
             <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
-          <parameter name="progress_callback_data" transfer-ownership="none">
+          <parameter name="progress_callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data to pass to @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26103,7 +26396,11 @@
     information, or %NULL if progress information is not needed</doc>
             <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
-          <parameter name="progress_callback_data" transfer-ownership="none">
+          <parameter name="progress_callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">user data to pass to @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26116,7 +26413,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="7">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="7">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26228,7 +26529,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26351,7 +26656,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26441,7 +26750,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26528,7 +26841,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26608,7 +26925,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26740,7 +27061,11 @@
     request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -26864,7 +27189,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27204,7 +27533,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27316,7 +27649,11 @@
             <type name="FileMeasureProgressCallback"
                   c:type="GFileMeasureProgressCallback"/>
           </parameter>
-          <parameter name="progress_data" transfer-ownership="none">
+          <parameter name="progress_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user_data for @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27389,7 +27726,11 @@
             <type name="FileMeasureProgressCallback"
                   c:type="GFileMeasureProgressCallback"/>
           </parameter>
-          <parameter name="progress_data" transfer-ownership="none">
+          <parameter name="progress_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user_data for @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27402,7 +27743,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when complete</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="6">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27588,7 +27933,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27665,7 +28014,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27767,7 +28120,11 @@
     function for updates</doc>
             <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
-          <parameter name="progress_callback_data" transfer-ownership="none">
+          <parameter name="progress_callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">gpointer to user data for
     the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
@@ -27854,7 +28211,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -27919,7 +28280,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="2">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -28079,7 +28444,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -28214,7 +28583,11 @@
     request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -28346,7 +28719,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -28536,7 +28913,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="6">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -28672,7 +29053,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="6">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -28817,7 +29202,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">a #gpointer</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -28978,7 +29367,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29054,7 +29447,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29134,7 +29531,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29224,7 +29625,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29295,7 +29700,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29378,7 +29787,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29494,7 +29907,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29594,7 +30011,11 @@
     progress information, or %NULL if progress information is not needed</doc>
             <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
-          <parameter name="progress_callback_data" transfer-ownership="none">
+          <parameter name="progress_callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data to pass to @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29650,7 +30071,11 @@
     information, or %NULL if progress information is not needed</doc>
             <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
-          <parameter name="progress_callback_data" transfer-ownership="none">
+          <parameter name="progress_callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">user data to pass to @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29663,9 +30088,13 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
-            <doc xml:space="preserve">the data to pass to callback function</doc>
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="7">
+            <doc xml:space="preserve">the data to pass to callback function</doc>
+            <type name="gpointer" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
@@ -29814,7 +30243,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -29939,7 +30372,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -30029,7 +30466,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -30116,7 +30557,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -30196,7 +30641,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -30328,7 +30777,11 @@
     request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -30452,7 +30905,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -30902,7 +31359,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31004,7 +31465,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to the callback functions</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31133,7 +31598,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31282,7 +31751,11 @@
             <type name="FileMeasureProgressCallback"
                   c:type="GFileMeasureProgressCallback"/>
           </parameter>
-          <parameter name="progress_data" transfer-ownership="none">
+          <parameter name="progress_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user_data for @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31355,7 +31828,11 @@
             <type name="FileMeasureProgressCallback"
                   c:type="GFileMeasureProgressCallback"/>
           </parameter>
-          <parameter name="progress_data" transfer-ownership="none">
+          <parameter name="progress_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user_data for @progress_callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31368,7 +31845,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when complete</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31591,7 +32072,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31668,7 +32153,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31770,7 +32259,11 @@
     function for updates</doc>
             <type name="FileProgressCallback" c:type="GFileProgressCallback"/>
           </parameter>
-          <parameter name="progress_callback_data" transfer-ownership="none">
+          <parameter name="progress_callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">gpointer to user data for
     the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
@@ -31857,7 +32350,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -31922,7 +32419,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -32155,7 +32656,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -32290,7 +32795,11 @@
     request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -32453,7 +32962,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -32612,7 +33125,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -32763,7 +33280,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="7">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -32823,7 +33344,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -32991,7 +33516,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -33383,7 +33912,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">a #gpointer</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -33544,7 +34077,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -33620,7 +34157,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -33700,7 +34241,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -33810,7 +34355,11 @@
     when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -33881,7 +34430,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -33964,7 +34517,11 @@
     when the request is satisfied, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -34636,7 +35193,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -34768,7 +35329,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -34857,7 +35422,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -35125,7 +35694,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -35265,7 +35838,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -35324,7 +35901,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -35550,7 +36131,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -35729,7 +36314,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -35909,7 +36498,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -36378,7 +36971,11 @@
     request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -36476,7 +37073,11 @@
     request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -36566,7 +37167,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -36649,7 +37254,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -36739,7 +37348,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -36954,7 +37567,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">a #gpointer</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37040,7 +37657,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37129,7 +37750,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37220,7 +37845,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37333,7 +37962,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="7">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="7">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37413,7 +38046,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37492,7 +38129,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37571,7 +38212,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37674,7 +38319,11 @@
               <type name="FileProgressCallback"
                     c:type="GFileProgressCallback"/>
             </parameter>
-            <parameter name="progress_callback_data" transfer-ownership="none">
+            <parameter name="progress_callback_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data to pass to @progress_callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37721,7 +38370,11 @@
               <type name="FileProgressCallback"
                     c:type="GFileProgressCallback"/>
             </parameter>
-            <parameter name="progress_callback_data" transfer-ownership="none">
+            <parameter name="progress_callback_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">user data to pass to @progress_callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37734,7 +38387,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="8">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="8">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37797,7 +38454,11 @@
               <type name="FileProgressCallback"
                     c:type="GFileProgressCallback"/>
             </parameter>
-            <parameter name="progress_callback_data" transfer-ownership="none">
+            <parameter name="progress_callback_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">gpointer to user data for
     the callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
@@ -37859,7 +38520,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37917,7 +38582,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -37975,7 +38644,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38041,7 +38714,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38178,7 +38855,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38268,7 +38949,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38381,7 +39066,11 @@
     when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="7">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="7">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38444,7 +39133,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38510,7 +39203,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38580,7 +39277,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38646,7 +39347,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38699,7 +39404,11 @@
     when the request is satisfied, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="3">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="3">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38757,7 +39466,11 @@
               <type name="FileMeasureProgressCallback"
                     c:type="GFileMeasureProgressCallback"/>
             </parameter>
-            <parameter name="progress_data" transfer-ownership="none">
+            <parameter name="progress_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">user_data for @progress_callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38825,7 +39538,11 @@
               <type name="FileMeasureProgressCallback"
                     c:type="GFileMeasureProgressCallback"/>
             </parameter>
-            <parameter name="progress_data" transfer-ownership="none">
+            <parameter name="progress_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user_data for @progress_callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -38838,7 +39555,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback to call when complete</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="7">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="7">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -39064,7 +39785,8 @@
                      transfer-ownership="full"
                      optional="1"
                      allow-none="1">
-            <doc xml:space="preserve">return location for the attribute value, or %NULL</doc>
+            <doc xml:space="preserve">return location for the
+   attribute value, or %NULL; the attribute value will not be %NULL</doc>
             <type name="gpointer" c:type="gpointer*"/>
           </parameter>
           <parameter name="status"
@@ -40183,7 +40905,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -40315,7 +41041,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -40460,7 +41190,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -40612,7 +41346,11 @@
           <doc xml:space="preserve">the number of non-directory files encountered</doc>
           <type name="guint64" c:type="guint64"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="4">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="4">
           <doc xml:space="preserve">the data passed to the original request for this callback</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -41140,7 +41878,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -41314,7 +42056,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -41494,7 +42240,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -41589,7 +42339,11 @@
           <doc xml:space="preserve">the total number of bytes in the operation.</doc>
           <type name="gint64" c:type="goffset"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">user data passed to the callback.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -41631,7 +42385,10 @@
           <doc xml:space="preserve">the size of the data currently read.</doc>
           <type name="gint64" c:type="goffset"/>
         </parameter>
-        <parameter name="callback_data" transfer-ownership="none">
+        <parameter name="callback_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1">
           <doc xml:space="preserve">data passed to the callback.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -42773,7 +43530,11 @@
             <doc xml:space="preserve">a #GSourceFunc callback that will be called in the original thread</doc>
             <type name="GLib.SourceFunc" c:type="GSourceFunc"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="1">
             <doc xml:space="preserve">data to pass to @func</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -42816,7 +43577,11 @@
             <doc xml:space="preserve">a #GSourceFunc callback that will be called in the original thread</doc>
             <type name="GLib.SourceFunc" c:type="GSourceFunc"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="1">
             <doc xml:space="preserve">data to pass to @func</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -42853,7 +43618,11 @@
           <doc xml:space="preserve">optional #GCancellable object, %NULL to ignore.</doc>
           <type name="Cancellable" c:type="GCancellable*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">the data to pass to callback function</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -42946,7 +43715,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -43132,7 +43905,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -43286,7 +44063,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -43394,7 +44175,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -45020,7 +45805,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -45092,8 +45881,8 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to
-    read data into (which should be at least count bytes long).</doc>
+            <doc xml:space="preserve">a buffer
+    to read data into (which should be at least count bytes long).</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -45123,7 +45912,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -45154,7 +45947,10 @@
           <instance-parameter name="stream" transfer-ownership="none">
             <type name="InputStream" c:type="GInputStream*"/>
           </instance-parameter>
-          <parameter name="buffer" transfer-ownership="none">
+          <parameter name="buffer"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <type name="gpointer" c:type="void*"/>
           </parameter>
           <parameter name="count" transfer-ownership="none">
@@ -45261,7 +46057,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -45377,7 +46177,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -45460,8 +46264,8 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to
-    read data into (which should be at least count bytes long).</doc>
+            <doc xml:space="preserve">a buffer
+    to read data into (which should be at least count bytes long).</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -45511,8 +46315,8 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to
-    read data into (which should be at least count bytes long).</doc>
+            <doc xml:space="preserve">a buffer
+    to read data into (which should be at least count bytes long).</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -45559,8 +46363,8 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to
-    read data into (which should be at least count bytes long)</doc>
+            <doc xml:space="preserve">a buffer
+    to read data into (which should be at least count bytes long)</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -45589,7 +46393,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -45663,8 +46471,8 @@
             <type name="InputStream" c:type="GInputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to
-    read data into (which should be at least count bytes long).</doc>
+            <doc xml:space="preserve">a buffer
+    to read data into (which should be at least count bytes long).</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -45694,7 +46502,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -45805,7 +46617,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -45960,7 +46776,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -46007,7 +46827,10 @@
             <parameter name="stream" transfer-ownership="none">
               <type name="InputStream" c:type="GInputStream*"/>
             </parameter>
-            <parameter name="buffer" transfer-ownership="none">
+            <parameter name="buffer"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1">
               <type name="gpointer" c:type="void*"/>
             </parameter>
             <parameter name="count" transfer-ownership="none">
@@ -46076,8 +46899,8 @@
               <type name="InputStream" c:type="GInputStream*"/>
             </parameter>
             <parameter name="buffer" transfer-ownership="none">
-              <doc xml:space="preserve">a buffer to
-    read data into (which should be at least count bytes long).</doc>
+              <doc xml:space="preserve">a buffer
+    to read data into (which should be at least count bytes long).</doc>
               <array length="2" zero-terminated="0" c:type="void*">
                 <type name="guint8"/>
               </array>
@@ -46107,7 +46930,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -46166,7 +46993,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -46221,7 +47052,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -46354,7 +47189,7 @@
 the [thread-default main context][g-main-context-push-thread-default]
 in effect at the time that the model was created.</doc>
       <virtual-method name="get_item" introspectable="0">
-        <return-value>
+        <return-value nullable="1">
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
         <parameters>
@@ -46598,7 +47433,7 @@
       </field>
       <field name="get_item" introspectable="0">
         <callback name="get_item" introspectable="0">
-          <return-value>
+          <return-value nullable="1">
             <type name="gpointer" c:type="gpointer"/>
           </return-value>
           <parameters>
@@ -46718,7 +47553,11 @@
             <doc xml:space="preserve">pairwise comparison function for sorting</doc>
             <type name="GLib.CompareDataFunc" c:type="GCompareDataFunc"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data for @compare_func</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -46775,7 +47614,11 @@
             <doc xml:space="preserve">pairwise comparison function for sorting</doc>
             <type name="GLib.CompareDataFunc" c:type="GCompareDataFunc"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="1">
             <doc xml:space="preserve">user data for @compare_func</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -46918,7 +47761,11 @@
            request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -47020,7 +47867,11 @@
            request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -47131,7 +47982,11 @@
            request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -47512,8 +48367,9 @@
 
 Note that the returned pointer may become invalid on the next
 write or truncate operation on the stream.</doc>
-        <return-value transfer-ownership="none">
-          <doc xml:space="preserve">pointer to the stream's data</doc>
+        <return-value transfer-ownership="none" nullable="1">
+          <doc xml:space="preserve">pointer to the stream's data, or %NULL if the data
+   has been stolen</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
         <parameters>
@@ -47591,8 +48447,9 @@
 #GMemoryOutputStream:destroy-function property.
 
 @ostream must be closed before calling this function.</doc>
-        <return-value transfer-ownership="full">
-          <doc xml:space="preserve">the stream's data</doc>
+        <return-value transfer-ownership="full" nullable="1">
+          <doc xml:space="preserve">the stream's data, or %NULL if it has previously
+   been stolen</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
         <parameters>
@@ -50033,7 +50890,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50104,7 +50965,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50320,7 +51185,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50448,7 +51317,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50510,7 +51383,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50581,7 +51458,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50680,7 +51561,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50751,7 +51636,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -50967,7 +51856,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -51122,7 +52015,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -51199,7 +52096,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -51270,7 +52171,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -51521,7 +52426,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">user data passed to @callback.</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -51576,7 +52485,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">user data passed to @callback.</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -51639,7 +52552,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data passed to @callback.</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -51695,7 +52612,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">user data passed to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -51802,7 +52723,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data passed to @callback.</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -51865,7 +52790,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data passed to @callback.</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -53106,7 +54035,11 @@
     request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -53228,7 +54161,11 @@
     request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -53468,7 +54405,11 @@
     request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -54133,7 +55074,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -54236,7 +55181,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -54337,7 +55286,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -54408,7 +55361,8 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">the buffer containing the data to write.</doc>
+            <doc xml:space="preserve">the
+   buffer containing the data to write.</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -54437,7 +55391,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -54491,7 +55449,8 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">the buffer containing the data to write.</doc>
+            <doc xml:space="preserve">the
+   buffer containing the data to write.</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -54609,7 +55568,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -54698,7 +55661,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -54916,7 +55883,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -55029,7 +56000,8 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">the buffer containing the data to write.</doc>
+            <doc xml:space="preserve">the
+   buffer containing the data to write.</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -55079,7 +56051,8 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">the buffer containing the data to write.</doc>
+            <doc xml:space="preserve">the
+   buffer containing the data to write.</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -55132,7 +56105,8 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">the buffer containing the data to write</doc>
+            <doc xml:space="preserve">the
+   buffer containing the data to write</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -55161,7 +56135,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -55248,7 +56226,8 @@
             <type name="OutputStream" c:type="GOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">the buffer containing the data to write.</doc>
+            <doc xml:space="preserve">the
+   buffer containing the data to write.</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -55277,7 +56256,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -55366,7 +56349,11 @@
             <doc xml:space="preserve">callback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -55435,7 +56422,8 @@
               <type name="OutputStream" c:type="GOutputStream*"/>
             </parameter>
             <parameter name="buffer" transfer-ownership="none">
-              <doc xml:space="preserve">the buffer containing the data to write.</doc>
+              <doc xml:space="preserve">the
+   buffer containing the data to write.</doc>
               <array length="2" zero-terminated="0" c:type="void*">
                 <type name="guint8"/>
               </array>
@@ -55538,7 +56526,8 @@
               <type name="OutputStream" c:type="GOutputStream*"/>
             </parameter>
             <parameter name="buffer" transfer-ownership="none">
-              <doc xml:space="preserve">the buffer containing the data to write.</doc>
+              <doc xml:space="preserve">the
+   buffer containing the data to write.</doc>
               <array length="2" zero-terminated="0" c:type="void*">
                 <type name="guint8"/>
               </array>
@@ -55567,7 +56556,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -55631,7 +56624,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">user data passed to @callback.</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -55689,7 +56686,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -55744,7 +56745,11 @@
               <doc xml:space="preserve">callback to call when the request is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -56003,7 +57008,11 @@
             <doc xml:space="preserve">the #GAsyncReadyCallback to call when done</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="2">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -56101,7 +57110,11 @@
             <doc xml:space="preserve">the #GAsyncReadyCallback to call when done</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="2">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -56199,7 +57212,11 @@
             <doc xml:space="preserve">the #GAsyncReadyCallback to call when done</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -56378,7 +57395,11 @@
             <doc xml:space="preserve">the #GAsyncReadyCallback to call when done</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the user data to pass to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -56483,7 +57504,11 @@
               <doc xml:space="preserve">the #GAsyncReadyCallback to call when done</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="3">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="3">
               <doc xml:space="preserve">the user data to pass to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -56555,7 +57580,11 @@
               <doc xml:space="preserve">the #GAsyncReadyCallback to call when done</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="3">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="3">
               <doc xml:space="preserve">the user data to pass to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -56696,8 +57725,8 @@
             <type name="PollableInputStream" c:type="GPollableInputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to
-    read data into (which should be at least @count bytes long).</doc>
+            <doc xml:space="preserve">a buffer
+    to read data into (which should be at least @count bytes long).</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -56808,8 +57837,8 @@
             <type name="PollableInputStream" c:type="GPollableInputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to
-    read data into (which should be at least @count bytes long).</doc>
+            <doc xml:space="preserve">a buffer
+    to read data into (which should be at least @count bytes long).</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -56911,8 +57940,8 @@
               <type name="PollableInputStream" c:type="GPollableInputStream*"/>
             </parameter>
             <parameter name="buffer" transfer-ownership="none">
-              <doc xml:space="preserve">a buffer to
-    read data into (which should be at least @count bytes long).</doc>
+              <doc xml:space="preserve">a buffer
+    to read data into (which should be at least @count bytes long).</doc>
               <array length="2" zero-terminated="0" c:type="void*">
                 <type name="guint8"/>
               </array>
@@ -57033,8 +58062,8 @@
             <type name="PollableOutputStream" c:type="GPollableOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to write
-    data from</doc>
+            <doc xml:space="preserve">a buffer
+    to write data from</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -57145,8 +58174,8 @@
             <type name="PollableOutputStream" c:type="GPollableOutputStream*"/>
           </instance-parameter>
           <parameter name="buffer" transfer-ownership="none">
-            <doc xml:space="preserve">a buffer to write
-    data from</doc>
+            <doc xml:space="preserve">a buffer
+    to write data from</doc>
             <array length="1" zero-terminated="0" c:type="void*">
               <type name="guint8"/>
             </array>
@@ -57252,8 +58281,8 @@
                     c:type="GPollableOutputStream*"/>
             </parameter>
             <parameter name="buffer" transfer-ownership="none">
-              <doc xml:space="preserve">a buffer to write
-    data from</doc>
+              <doc xml:space="preserve">a buffer
+    to write data from</doc>
               <array length="2" zero-terminated="0" c:type="void*">
                 <type name="guint8"/>
               </array>
@@ -57281,7 +58310,11 @@
           <doc xml:space="preserve">the #GPollableInputStream or #GPollableOutputStream</doc>
           <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="1">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="1">
           <doc xml:space="preserve">data passed in by the user.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -57542,7 +58575,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">callback data</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -57661,7 +58698,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">callback data</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -58132,7 +59173,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">callback data</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -58283,7 +59328,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -58410,7 +59459,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -58524,7 +59577,11 @@
               <doc xml:space="preserve">callback to call after resolution completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">data for @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -58559,12 +59616,15 @@
 @size bytes.
 
 The function should have the same semantics as realloc().</doc>
-      <return-value>
+      <return-value nullable="1">
         <doc xml:space="preserve">a pointer to the reallocated memory</doc>
         <type name="gpointer" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="data" transfer-ownership="none">
+        <parameter name="data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1">
           <doc xml:space="preserve">memory block to reallocate</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -58943,7 +60003,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -59064,7 +60128,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -59183,7 +60251,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -59267,7 +60339,11 @@
                      closure="3">
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
         </parameters>
@@ -59381,7 +60457,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -59502,7 +60582,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -59621,7 +60705,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -59763,7 +60851,11 @@
             <doc xml:space="preserve">callback to call after resolution completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -59912,7 +61004,11 @@
               <doc xml:space="preserve">callback to call after resolution completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">data for @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -59997,7 +61093,11 @@
               <doc xml:space="preserve">callback to call after resolution completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">data for @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -60072,7 +61172,11 @@
                        closure="4">
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
           </parameters>
@@ -60168,7 +61272,11 @@
               <doc xml:space="preserve">callback to call after resolution completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">data for @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -61767,7 +62875,11 @@
             <type name="SettingsBindSetMapping"
                   c:type="GSettingsBindSetMapping"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="6">
             <doc xml:space="preserve">data that gets passed to @get_mapping and @set_mapping</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -62140,7 +63252,7 @@
 to each invocation of @mapping.  The final value of that #gpointer is
 what is returned by this function.  %NULL is valid; it is returned
 just as any other value would be.</doc>
-        <return-value transfer-ownership="full">
+        <return-value transfer-ownership="full" nullable="1">
           <doc xml:space="preserve">the result, which may be %NULL</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -62161,7 +63273,11 @@
           settings database to the value used by the application</doc>
             <type name="SettingsGetMapping" c:type="GSettingsGetMapping"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data for @mapping</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -63033,7 +64149,11 @@
           <doc xml:space="preserve">the #GVariant</doc>
           <type name="GLib.Variant" c:type="GVariant*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">user data that was specified when the binding was created</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -63056,7 +64176,11 @@
           <doc xml:space="preserve">the #GVariantType to create</doc>
           <type name="GLib.VariantType" c:type="const GVariantType*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">user data that was specified when the binding was created</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -63160,11 +64284,16 @@
         <parameter name="result"
                    direction="out"
                    caller-allocates="0"
-                   transfer-ownership="full">
+                   transfer-ownership="full"
+                   nullable="1">
           <doc xml:space="preserve">the result of the mapping</doc>
           <type name="gpointer" c:type="gpointer*"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">the user data that was passed to
 g_settings_get_mapped()</doc>
           <type name="gpointer" c:type="gpointer"/>
@@ -64124,7 +65253,10 @@
             <doc xml:space="preserve">the length of @entries, or -1</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">the user data for signal connections</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -64435,11 +65567,18 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
-          <parameter name="source_tag" transfer-ownership="none">
+          <parameter name="source_tag"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">the asynchronous function.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -64473,7 +65612,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -64522,7 +65665,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -64562,7 +65709,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -64684,7 +65835,7 @@
               deprecated-version="2.46">
         <doc xml:space="preserve">Gets a pointer result as returned by the asynchronous function.</doc>
         <doc-deprecated xml:space="preserve">Use #GTask and g_task_propagate_pointer() instead.</doc-deprecated>
-        <return-value>
+        <return-value nullable="1">
           <doc xml:space="preserve">a pointer from the result.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -64719,7 +65870,7 @@
               deprecated-version="2.46.">
         <doc xml:space="preserve">Gets the source tag for the #GSimpleAsyncResult.</doc>
         <doc-deprecated xml:space="preserve">Use #GTask and g_task_get_source_tag() instead.</doc-deprecated>
-        <return-value>
+        <return-value nullable="1">
           <doc xml:space="preserve">a #gpointer to the source object for the #GSimpleAsyncResult.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -64974,7 +66125,10 @@
             <doc xml:space="preserve">a #GSimpleAsyncResult.</doc>
             <type name="SimpleAsyncResult" c:type="GSimpleAsyncResult*"/>
           </instance-parameter>
-          <parameter name="op_res" transfer-ownership="none">
+          <parameter name="op_res"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">a pointer result from an asynchronous function.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -67340,7 +68494,10 @@
             <doc xml:space="preserve">a #GSocketAddress</doc>
             <type name="SocketAddress" c:type="GSocketAddress*"/>
           </instance-parameter>
-          <parameter name="dest" transfer-ownership="none">
+          <parameter name="dest"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">a pointer to a memory location that will contain the native
 struct sockaddr</doc>
             <type name="gpointer" c:type="gpointer"/>
@@ -67404,7 +68561,10 @@
             <doc xml:space="preserve">a #GSocketAddress</doc>
             <type name="SocketAddress" c:type="GSocketAddress*"/>
           </instance-parameter>
-          <parameter name="dest" transfer-ownership="none">
+          <parameter name="dest"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">a pointer to a memory location that will contain the native
 struct sockaddr</doc>
             <type name="gpointer" c:type="gpointer"/>
@@ -67469,7 +68629,10 @@
               <doc xml:space="preserve">a #GSocketAddress</doc>
               <type name="SocketAddress" c:type="GSocketAddress*"/>
             </parameter>
-            <parameter name="dest" transfer-ownership="none">
+            <parameter name="dest"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1">
               <doc xml:space="preserve">a pointer to a memory location that will contain the native
 struct sockaddr</doc>
               <type name="gpointer" c:type="gpointer"/>
@@ -67558,7 +68721,11 @@
     is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="2">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -67655,7 +68822,11 @@
     is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -67748,7 +68919,11 @@
     is satisfied</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="3">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="3">
               <doc xml:space="preserve">the data to pass to callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -68019,7 +69194,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data for the callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -68145,7 +69324,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data for the callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -68251,7 +69434,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data for the callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -68368,7 +69555,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data for the callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -69356,7 +70547,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data for the callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -70012,7 +71207,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data for the callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -70124,7 +71323,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data for the callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -70838,7 +72041,11 @@
           <doc xml:space="preserve">the current condition at the source fired.</doc>
           <type name="GLib.IOCondition" c:type="GIOCondition"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none" closure="2">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">data passed in by the user.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -71355,7 +72562,11 @@
             <doc xml:space="preserve">Callback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">User data</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -71471,7 +72682,11 @@
             <doc xml:space="preserve">Callback</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">User data</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -71815,7 +73030,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the operation is complete</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user_data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -71875,7 +73094,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the operation is complete</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user_data for @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -72112,7 +73335,11 @@
             <type name="GLib.SpawnChildSetupFunc"
                   c:type="GSpawnChildSetupFunc"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="1">
             <doc xml:space="preserve">user data for @child_setup</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -73100,7 +74327,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="callback_data" transfer-ownership="none">
+          <parameter name="callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -73162,11 +74393,18 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="callback_data" transfer-ownership="none">
+          <parameter name="callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
-          <parameter name="source_tag" transfer-ownership="none">
+          <parameter name="source_tag"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">an opaque pointer indicating the source of this task</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -73210,11 +74448,18 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="callback_data" transfer-ownership="none">
+          <parameter name="callback_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">user data passed to @callback.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
-          <parameter name="source_tag" transfer-ownership="none">
+          <parameter name="source_tag"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">an opaque pointer indicating the source of this task</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -73382,7 +74627,7 @@
               c:identifier="g_task_get_source_tag"
               version="2.36">
         <doc xml:space="preserve">Gets @task's source tag. See g_task_set_source_tag().</doc>
-        <return-value transfer-ownership="none">
+        <return-value transfer-ownership="none" nullable="1">
           <doc xml:space="preserve">@task's source tag</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -73397,7 +74642,7 @@
               c:identifier="g_task_get_task_data"
               version="2.36">
         <doc xml:space="preserve">Gets @task's `task_data`.</doc>
-        <return-value transfer-ownership="none">
+        <return-value transfer-ownership="none" nullable="1">
           <doc xml:space="preserve">@task's `task_data`.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -73477,7 +74722,7 @@
 
 Since this method transfers ownership of the return value (or
 error) to the caller, you may only call it once.</doc>
-        <return-value transfer-ownership="full">
+        <return-value transfer-ownership="full" nullable="1">
           <doc xml:space="preserve">the task result, or %NULL on error</doc>
           <type name="gpointer" c:type="gpointer"/>
         </return-value>
@@ -73843,7 +75088,10 @@
             <doc xml:space="preserve">the #GTask</doc>
             <type name="Task" c:type="GTask*"/>
           </instance-parameter>
-          <parameter name="source_tag" transfer-ownership="none">
+          <parameter name="source_tag"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <doc xml:space="preserve">an opaque pointer indicating the source of this task</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -73924,7 +75172,10 @@
           <doc xml:space="preserve">@task's source object</doc>
           <type name="GObject.Object" c:type="gpointer"/>
         </parameter>
-        <parameter name="task_data" transfer-ownership="none">
+        <parameter name="task_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1">
           <doc xml:space="preserve">@task's task data</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -75758,7 +77009,11 @@
             <doc xml:space="preserve">callback to call when the handshake is complete</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -76023,7 +77278,11 @@
             <doc xml:space="preserve">callback to call when the handshake is complete</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -76464,7 +77723,11 @@
               <doc xml:space="preserve">callback to call when the handshake is complete</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">the data to pass to the callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -76638,7 +77901,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -76761,7 +78028,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -76887,7 +78158,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="5">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -77048,7 +78323,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="7">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="7">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -77199,7 +78478,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -77322,7 +78605,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -77448,7 +78735,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="5">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -77609,7 +78900,11 @@
             <doc xml:space="preserve">callback to call when the operation completes</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="7">
             <doc xml:space="preserve">the data to pass to the callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -77756,7 +79051,11 @@
               <doc xml:space="preserve">callback to call when the operation completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="8">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="8">
               <doc xml:space="preserve">the data to pass to the callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -77881,7 +79180,11 @@
               <doc xml:space="preserve">callback to call when the operation completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">the data to pass to the callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -77987,7 +79290,11 @@
               <doc xml:space="preserve">callback to call when the operation completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">the data to pass to the callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -78099,7 +79406,11 @@
               <doc xml:space="preserve">callback to call when the operation completes</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="6">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="6">
               <doc xml:space="preserve">the data to pass to the callback function</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -78662,7 +79973,8 @@
           <parameter name="user_data"
                      transfer-ownership="none"
                      nullable="1"
-                     allow-none="1">
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">data to pass to the @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -78886,7 +80198,8 @@
           <parameter name="user_data"
                      transfer-ownership="none"
                      nullable="1"
-                     allow-none="1">
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">data to pass to the @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -79749,7 +81062,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -79873,7 +81190,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="2">
             <doc xml:space="preserve">the data to pass to callback function</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -81590,7 +82911,10 @@
                      allow-none="1">
             <type name="Cancellable" c:type="GCancellable*"/>
           </parameter>
-          <parameter name="extra_data" transfer-ownership="none">
+          <parameter name="extra_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1">
             <type name="gpointer" c:type="gpointer*"/>
           </parameter>
           <parameter name="free_extra_data"
@@ -81892,7 +83216,10 @@
                        allow-none="1">
               <type name="Cancellable" c:type="GCancellable*"/>
             </parameter>
-            <parameter name="extra_data" transfer-ownership="none">
+            <parameter name="extra_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1">
               <type name="gpointer" c:type="gpointer*"/>
             </parameter>
             <parameter name="free_extra_data"
@@ -82156,7 +83483,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="3">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data that gets passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -82227,7 +83558,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -82505,7 +83840,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none" closure="4">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data that gets passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -82596,7 +83935,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="3">
             <doc xml:space="preserve">user data that gets passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -82667,7 +84010,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -82922,7 +84269,11 @@
             <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
             <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
           </parameter>
-          <parameter name="user_data" transfer-ownership="none">
+          <parameter name="user_data"
+                     transfer-ownership="none"
+                     nullable="1"
+                     allow-none="1"
+                     closure="4">
             <doc xml:space="preserve">user data that gets passed to @callback</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
@@ -83157,7 +84508,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data that gets passed to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -83212,7 +84567,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="4">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="4">
               <doc xml:space="preserve">user data that gets passed to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -83341,7 +84700,11 @@
               <doc xml:space="preserve">a #GAsyncReadyCallback, or %NULL</doc>
               <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
             </parameter>
-            <parameter name="user_data" transfer-ownership="none" closure="5">
+            <parameter name="user_data"
+                       transfer-ownership="none"
+                       nullable="1"
+                       allow-none="1"
+                       closure="5">
               <doc xml:space="preserve">user data passed to @callback</doc>
               <type name="gpointer" c:type="gpointer"/>
             </parameter>
@@ -84844,7 +86207,11 @@
     finished</doc>
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="6">
           <doc xml:space="preserve">the data to pass to callback function</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -84882,7 +86249,11 @@
           <doc xml:space="preserve">a #GAsyncReadyCallback to call when the request is satisfied</doc>
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="3">
           <doc xml:space="preserve">the data to pass to @callback</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -85051,7 +86422,11 @@
           <doc xml:space="preserve">handler to invoke when @name is lost or %NULL</doc>
           <type name="BusNameLostCallback" c:type="GBusNameLostCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="6">
           <doc xml:space="preserve">user data to pass to handlers</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -85108,7 +86483,11 @@
           <doc xml:space="preserve">handler to invoke when @name is lost or %NULL</doc>
           <type name="BusNameLostCallback" c:type="GBusNameLostCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="5">
           <doc xml:space="preserve">user data to pass to handlers</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -85313,7 +86692,11 @@
           <type name="BusNameVanishedCallback"
                 c:type="GBusNameVanishedCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="5">
           <doc xml:space="preserve">User data to pass to handlers.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -85371,7 +86754,11 @@
           <type name="BusNameVanishedCallback"
                 c:type="GBusNameVanishedCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="5">
           <doc xml:space="preserve">User data to pass to handlers.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -85805,7 +87192,11 @@
           <doc xml:space="preserve">A #GAsyncReadyCallback to call when the request is satisfied.</doc>
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="3">
           <doc xml:space="preserve">Data to pass to @callback.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -86783,7 +88174,11 @@
           <doc xml:space="preserve">a #GIOSchedulerJobFunc.</doc>
           <type name="IOSchedulerJobFunc" c:type="GIOSchedulerJobFunc"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="1">
           <doc xml:space="preserve">data to pass to @job_func</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -87317,7 +88712,11 @@
           <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">user data passed to @callback.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -87367,7 +88766,11 @@
           <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">user data passed to @callback.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
@@ -87407,7 +88810,11 @@
           <doc xml:space="preserve">a #GAsyncReadyCallback.</doc>
           <type name="AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
         </parameter>
-        <parameter name="user_data" transfer-ownership="none">
+        <parameter name="user_data"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1"
+                   closure="2">
           <doc xml:space="preserve">user data passed to @callback.</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
