--- gio_docs_orig.xml	2010-04-06 23:58:50.000000000 -0400
+++ gio_docs_new.xml	2010-04-07 23:14:51.000000000 -0400
@@ -153,6 +153,7 @@
 <description>
 Gets @target's port
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -163,7 +164,6 @@
 </parameters>
 <return> @target's port
 
-Since: 2.22
 </return>
 </function>
 
@@ -259,7 +259,8 @@
 
 <function name="g_volume_should_automount">
 <description>
-Returns: %TRUE if the volume should be automatically mounted.
+Returns whether the volume should be automatically mounted.
+
 
 </description>
 <parameters>
@@ -286,6 +287,43 @@
 <return></return>
 </function>
 
+<function name="g_socket_client_connect_to_service_async">
+<description>
+This is the asynchronous version of
+g_socket_client_connect_to_service().
+
+Since: 2.22
+
+</description>
+<parameters>
+<parameter name="client">
+<parameter_description> a #GSocketClient
+</parameter_description>
+</parameter>
+<parameter name="domain">
+<parameter_description> a domain name
+</parameter_description>
+</parameter>
+<parameter name="service">
+<parameter_description> the name of the service to connect to
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> a #GCancellable, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="callback">
+<parameter_description> a #GAsyncReadyCallback
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> user data for the callback
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_unix_mount_monitor_new">
 <description>
 Gets a new #GUnixMountMonitor. The default rate limit for which the
@@ -309,6 +347,7 @@
 #GAppInfo&lt;!-- --&gt;s which can be deleted, and system-wide ones which
 cannot. See g_app_info_can_delete().
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -319,7 +358,6 @@
 </parameters>
 <return> %TRUE if @appinfo has been deleted
 
-Since: 2.20
 </return>
 </function>
 
@@ -330,6 +368,7 @@
 a non-active service will let connecting clients queue
 up until the service is started.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -340,7 +379,6 @@
 </parameters>
 <return> %TRUE if the service is active, %FALSE otherwise
 
-Since: 2.22
 </return>
 </function>
 
@@ -421,7 +459,10 @@
 
 <function name="g_socket_control_message_get_level">
 <description>
-Returns: an integer describing the level
+Returns the &quot;level&quot; (i.e. the originating protocol) of the control message.
+This is often SOL_SOCKET.
+
+Since: 2.22
 
 </description>
 <parameters>
@@ -432,7 +473,6 @@
 </parameters>
 <return> an integer describing the level
 
-Since: 2.22
 </return>
 </function>
 
@@ -485,6 +525,7 @@
 Finishes the async construction for the various g_async_initable_new calls,
 returning the created object or %NULL on error.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -505,7 +546,6 @@
 <return> a newly created #GObject, or %NULL on error. Free with
 g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -513,6 +553,7 @@
 <description>
 Creates a new #GZlibCompressor.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -527,7 +568,6 @@
 </parameters>
 <return> a new #GZlibCompressor
 
-Since: 2.24
 </return>
 </function>
 
@@ -567,6 +607,7 @@
 <description>
 Checks if a stream has pending actions.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -577,7 +618,6 @@
 </parameters>
 <return> %TRUE if @stream has pending actions.
 
-Since: 2.22
 </return>
 </function>
 
@@ -702,38 +742,6 @@
 <return></return>
 </function>
 
-<function name="g_content_type_from_mime_type">
-<description>
-Tries to find a content type based on the mime type name.
-
-
-</description>
-<parameters>
-<parameter name="mime_type">
-<parameter_description> a mime type string.
-</parameter_description>
-</parameter>
-</parameters>
-<return> Newly allocated string with content type or NULL when does not know.
-
-Since: 2.18
-</return>
-</function>
-
-<function name="GUnixMountMonitor">
-<description>
-Emitted when the unix mount points have changed.
-
-</description>
-<parameters>
-<parameter name="monitor">
-<parameter_description> the object on which the signal is emitted
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_info_set_sort_order">
 <description>
 Sets the sort order attribute in the file info structure. See 
@@ -822,6 +830,7 @@
 condition change). You can check for this in the callback using
 g_cancellable_is_cancelled().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -840,7 +849,6 @@
 </parameters>
 <return> a newly allocated %GSource, free with g_source_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -880,6 +888,7 @@
 <description>
 Gets @address's #GInetAddress.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -891,7 +900,6 @@
 <return> the #GInetAddress for @address, which must be
 g_object_ref()'d if it will be stored
 
-Since: 2.22
 </return>
 </function>
 
@@ -1108,22 +1116,6 @@
 </return>
 </function>
 
-<function name="g_unix_mount_guess_should_display">
-<description>
-Guesses whether a Unix mount should be displayed in the UI.
-
-
-</description>
-<parameters>
-<parameter name="mount_entry">
-<parameter_description> a #GUnixMountEntry
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if @mount_entry is deemed to be displayable.
-</return>
-</function>
-
 <function name="g_async_result_get_user_data">
 <description>
 Gets the user data from a #GAsyncResult.
@@ -1144,6 +1136,7 @@
 <description>
 Sorts @targets in place according to the algorithm in RFC 2782.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -1154,7 +1147,6 @@
 </parameters>
 <return> the head of the sorted list.
 
-Since: 2.22
 </return>
 </function>
 
@@ -1199,6 +1191,7 @@
 This is used to check for errors when g_socket_connect() is
 used in non-blocking mode.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -1213,7 +1206,6 @@
 </parameters>
 <return> %TRUE if no error, %FALSE otherwise, setting @error to the error
 
-Since: 2.22
 </return>
 </function>
 
@@ -1258,6 +1250,7 @@
 address, it may be easier to create a #GNetworkAddress and use its
 #GSocketConnectable interface.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -1282,7 +1275,6 @@
 must unref each of the addresses and free the list when you are
 done with it. (You can use g_resolver_free_addresses() to do this.)
 
-Since: 2.22
 </return>
 </function>
 
@@ -1336,6 +1328,7 @@
 <description>
 Gets @srv's service name (eg, &quot;ldap&quot;).
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -1346,7 +1339,6 @@
 </parameters>
 <return> @srv's service name
 
-Since: 2.22
 </return>
 </function>
 
@@ -1417,6 +1409,7 @@
 a value from #GResolverError. If the operation was cancelled,
 @error will be set to %G_IO_ERROR_CANCELLED.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -1436,7 +1429,6 @@
 <return> a #GList of #GInetAddress, or %NULL on error. See
 g_resolver_lookup_by_name() for more details.
 
-Since: 2.22
 </return>
 </function>
 
@@ -1487,6 +1479,7 @@
 return a reference to the caller, but the returned list is valid for
 the lifetime of @message.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -1497,7 +1490,6 @@
 </parameters>
 <return> the #GUnixFDList from @message
 
-Since: 2.24
 </return>
 </function>
 
@@ -1513,6 +1505,7 @@
 operation, in which case @error (if non-%NULL) will be set to
 %G_IO_ERROR_CANCELLED.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -1536,7 +1529,6 @@
 <return> a hostname (either ASCII-only, or in ASCII-encoded
 form), or %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -1573,32 +1565,6 @@
 </return>
 </function>
 
-<function name="GFileMonitor">
-<description>
-Emitted when a file has been changed. 
-
-</description>
-<parameters>
-<parameter name="monitor">
-<parameter_description> a #GFileMonitor.
-</parameter_description>
-</parameter>
-<parameter name="file">
-<parameter_description> a #GFile.
-</parameter_description>
-</parameter>
-<parameter name="other_file">
-<parameter_description> a #GFile.
-</parameter_description>
-</parameter>
-<parameter name="event_type">
-<parameter_description> a #GFileMonitorEvent.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_info_dup">
 <description>
 Duplicates a file info structure.
@@ -1672,7 +1638,18 @@
 
 <function name="g_file_replace_readwrite">
 <description>
-Returns: a #GFileIOStream or %NULL on error.
+Returns an output stream for overwriting the file in readwrite mode,
+possibly creating a backup copy of the file first. If the file doesn't
+exist, it will be created.
+
+For details about the behaviour, see g_file_replace() which does the same
+thing but returns an output stream only.
+
+Note that in many non-local file cases read and write streams are not
+supported, so make sure you really need to do read and write streaming,
+rather than just opening for reading or writing.
+
+Since: 2.22
 
 </description>
 <parameters>
@@ -1705,42 +1682,30 @@
 <return> a #GFileIOStream or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
-<function name="g_volume_eject_with_operation">
+<function name="g_socket_set_blocking">
 <description>
-Ejects a volume. This is an asynchronous operation, and is
-finished by calling g_volume_eject_with_operation_finish() with the @volume
-and #GAsyncResult data returned in the @callback.
+Sets the blocking mode of the socket. In blocking mode
+all operations block until they succeed or there is an error. In
+non-blocking mode all functions return results immediately or
+with a %G_IO_ERROR_WOULD_BLOCK error.
+
+All sockets are created in blocking mode. However, note that the
+platform level socket is always non-blocking, and blocking mode
+is a GSocket level feature.
 
 Since: 2.22
 
 </description>
 <parameters>
-<parameter name="volume">
-<parameter_description> a #GVolume.
-</parameter_description>
-</parameter>
-<parameter name="flags">
-<parameter_description> flags affecting the unmount if required for eject
-</parameter_description>
-</parameter>
-<parameter name="mount_operation">
-<parameter_description> a #GMountOperation or %NULL to avoid user interaction.
-</parameter_description>
-</parameter>
-<parameter name="cancellable">
-<parameter_description> optional #GCancellable object, %NULL to ignore.
-</parameter_description>
-</parameter>
-<parameter name="callback">
-<parameter_description> a #GAsyncReadyCallback, or %NULL.
+<parameter name="socket">
+<parameter_description> a #GSocket.
 </parameter_description>
 </parameter>
-<parameter name="user_data">
-<parameter_description> user data passed to @callback.
+<parameter name="blocking">
+<parameter_description> Whether to use blocking I/O or not.
 </parameter_description>
 </parameter>
 </parameters>
@@ -1901,6 +1866,7 @@
 Checks if graceful disconnects are used. See
 g_tcp_connection_set_graceful_disconnect().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -1911,39 +1877,36 @@
 </parameters>
 <return> %TRUE if graceful disconnect is used on close, %FALSE otherwise
 
-Since: 2.22
 </return>
 </function>
 
-<function name="GDesktopAppInfo">
+<function name="can">
 <description>
-Information about an installed application from a desktop file.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
+messages are often called &quot;ancillary data&quot;.
 
-<function name="g_output_stream_is_closing">
-<description>
-Checks if an output stream is being closed. This can be
-used inside e.g. a flush implementation to see if the
-flush (or other i/o operation) is called from within
-the closing operation.
+The message can represent some sort of special instruction to or
+information from the socket or can represent a special kind of
+transfer to the peer (for example, sending a file description over
+a UNIX socket).
+
+These messages are sent with g_socket_send_message() and received
+with g_socket_receive_message().
+
+To extend the set of control message that can be sent, subclass this
+class and override the get_size, get_level, get_type and serialize
+methods.
+
+To extend the set of control messages that can be received, subclass
+this class and implement the deserialize method. Also, make sure your
+class is registered with the GType typesystem before calling
+g_socket_receive_message() to read such a message.
 
+Since: 2.22
 
 </description>
 <parameters>
-<parameter name="stream">
-<parameter_description> a #GOutputStream.
-</parameter_description>
-</parameter>
 </parameters>
-<return> %TRUE if @stream is being closed. %FALSE otherwise.
-
-Since: 2.24
-</return>
+<return></return>
 </function>
 
 <function name="g_unix_mount_point_guess_icon">
@@ -1990,6 +1953,7 @@
 
 If @n_fds is -1 then @fds must be terminated with -1.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -2004,7 +1968,6 @@
 </parameters>
 <return> a new #GUnixFDList
 
-Since: 2.24
 </return>
 </function>
 
@@ -2042,7 +2005,10 @@
 
 <function name="g_socket_control_message_get_size">
 <description>
-Returns: The number of bytes required.
+Returns the space required for the control message, not including
+headers or alignment.
+
+Since: 2.22
 
 </description>
 <parameters>
@@ -2053,7 +2019,6 @@
 </parameters>
 <return> The number of bytes required.
 
-Since: 2.22
 </return>
 </function>
 
@@ -2087,6 +2052,7 @@
 <description>
 Checks if a drive can be started degraded.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -2097,7 +2063,6 @@
 </parameters>
 <return> %TRUE if the @drive can be started degraded, %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -2124,6 +2089,7 @@
 <description>
 Checks if a drive can be started.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -2134,7 +2100,6 @@
 </parameters>
 <return> %TRUE if the @drive can be started, %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -2235,6 +2200,27 @@
 </return>
 </function>
 
+<function name="g_unix_output_stream_set_close_fd">
+<description>
+Sets whether the file descriptor of @stream shall be closed
+when the stream is closed.
+
+Since: 2.20
+
+</description>
+<parameters>
+<parameter name="stream">
+<parameter_description> a #GUnixOutputStream
+</parameter_description>
+</parameter>
+<parameter name="close_fd">
+<parameter_description> %TRUE to close the file descriptor when done
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_file_enumerator_close_finish">
 <description>
 Finishes closing a file enumerator, started from g_file_enumerator_close_async().
@@ -2276,6 +2262,7 @@
 not be reached directly from the Internet, but which may have
 outgoing Internet connectivity via a NAT or firewall).
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -2286,7 +2273,6 @@
 </parameters>
 <return> %TRUE if @address is a site-local address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -2318,95 +2304,31 @@
 <description>
 Checks if abstract unix domain socket names are supported.
 
+Since: 2.22
 
 </description>
 <parameters>
 </parameters>
 <return> %TRUE if supported, %FALSE otherwise
 
-Since: 2.22
 </return>
 </function>
 
-<function name="GCancellable">
+<function name="g_filter_input_stream_get_close_base_stream">
 <description>
-Emitted when the operation has been cancelled.
-
-Can be used by implementations of cancellable operations. If the
-operation is cancelled from another thread, the signal will be
-emitted in the thread that cancelled the operation, not the
-thread that is running the operation.
-
-Note that disconnecting from this signal (or any signal) in a
-multi-threaded program is prone to race conditions. For instance
-it is possible that a signal handler may be invoked even
-&lt;emphasis&gt;after&lt;/emphasis&gt; a call to
-g_signal_handler_disconnect() for that handler has already
-returned.
-
-There is also a problem when cancellation happen
-right before connecting to the signal. If this happens the
-signal will unexpectedly not be emitted, and checking before
-connecting to the signal leaves a race condition where this is
-still happening.
-
-In order to make it safe and easy to connect handlers there
-are two helper functions: g_cancellable_connect() and
-g_cancellable_disconnect() which protect against problems
-like this.
-
-An example of how to us this:
-|[
-/&lt;!-- --&gt;* Make sure we don't do any unnecessary work if already cancelled *&lt;!-- --&gt;/
-if (g_cancellable_set_error_if_cancelled (cancellable))
-return;
-
-/&lt;!-- --&gt;* Set up all the data needed to be able to
-* handle cancellation of the operation *&lt;!-- --&gt;/
-my_data = my_data_new (...);
-
-id = 0;
-if (cancellable)
-id = g_cancellable_connect (cancellable,
-G_CALLBACK (cancelled_handler)
-data, NULL);
-
-/&lt;!-- --&gt;* cancellable operation here... *&lt;!-- --&gt;/
-
-g_cancellable_disconnect (cancellable, id);
-
-/&lt;!-- --&gt;* cancelled_handler is never called after this, it
-* is now safe to free the data *&lt;!-- --&gt;/
-my_data_free (my_data);  
-]|
+Returns whether the base stream will be closed when @stream is
+closed.
 
-Note that the cancelled signal is emitted in the thread that
-the user cancelled from, which may be the main thread. So, the
-cancellable signal should not do something that can block.
 
 </description>
 <parameters>
-<parameter name="cancellable">
-<parameter_description> a #GCancellable.
+<parameter name="stream">
+<parameter_description> a #GFilterInputStream.
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
-</function>
-
-<function name="g_filter_input_stream_get_close_base_stream">
-<description>
-Return value: %TRUE if the base stream will be closed.
-
-</description>
-<parameters>
-<parameter name="stream">
-<parameter_description> a #GFilterInputStream.
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the base stream will be closed.
-</return>
+<return> %TRUE if the base stream will be closed.
+</return>
 </function>
 
 <function name="g_file_monitor">
@@ -2418,6 +2340,7 @@
 triggering the cancellable object from another thread. If the operation
 was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -2441,7 +2364,22 @@
 <return> a #GFileMonitor for the given @file, or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.18
+</return>
+</function>
+
+<function name="g_unix_mount_guess_should_display">
+<description>
+Guesses whether a Unix mount should be displayed in the UI.
+
+
+</description>
+<parameters>
+<parameter name="mount_entry">
+<parameter_description> a #GUnixMountEntry
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @mount_entry is deemed to be displayable.
 </return>
 </function>
 
@@ -2540,6 +2478,7 @@
 implementations you need to ensure that each #GType is registered
 with the type system prior to calling g_icon_new_for_string().
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -2555,7 +2494,6 @@
 <return> An object implementing the #GIcon interface or %NULL if
 @error is set.
 
-Since: 2.20
 </return>
 </function>
 
@@ -2598,6 +2536,7 @@
 of the first call. This is so that its safe to implement the singleton
 pattern in the GObject constructor function.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -2618,7 +2557,6 @@
 <return> %TRUE if successful. If an error has occurred, this function will
 return %FALSE and set @error appropriately if present.
 
-Since: 2.22
 </return>
 </function>
 
@@ -2660,6 +2598,23 @@
 </return>
 </function>
 
+<function name="g_io_extension_ref_class">
+<description>
+Gets a reference to the class for the type that is 
+associated with @extension.
+
+
+</description>
+<parameters>
+<parameter name="extension">
+<parameter_description> a #GIOExtension
+</parameter_description>
+</parameter>
+</parameters>
+<return> the #GTypeClass for the type of @extension
+</return>
+</function>
+
 <function name="g_memory_input_stream_new_from_data">
 <description>
 Creates a new #GMemoryInputStream with data in memory of a given size.
@@ -2688,6 +2643,7 @@
 <description>
 Creates a new #GDesktopAppInfo.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -2698,7 +2654,6 @@
 </parameters>
 <return> a new #GDesktopAppInfo or %NULL on error.
 
-Since: 2.18
 </return>
 </function>
 
@@ -2724,6 +2679,7 @@
 This can be useful if you want to do something unusual on it
 not supported by the #GSocketConnection APIs.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -2734,7 +2690,6 @@
 </parameters>
 <return> a #GSocketAddress or %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -2898,6 +2853,7 @@
 <description>
 Gets the raw binary address data from @address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -2910,10 +2866,24 @@
 which should not be modified, stored, or freed. The size of this
 array can be gotten with g_inet_address_get_native_size().
 
-Since: 2.22
 </return>
 </function>
 
+<function name="g_file_attribute_info_list_unref">
+<description>
+Removes a reference from the given @list. If the reference count
+falls to zero, the @list is deleted.
+
+</description>
+<parameters>
+<parameter name="list">
+<parameter_description> The #GFileAttributeInfoList to unreference.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_file_get_path">
 <description>
 Gets the local pathname for #GFile, if one exists. 
@@ -3043,6 +3013,7 @@
 <description>
 Gets the underlying file descriptor.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -3053,7 +3024,6 @@
 </parameters>
 <return> The file descriptor
 
-Since: 2.24
 </return>
 </function>
 
@@ -3161,6 +3131,7 @@
 triggering the cancellable object from another thread. If the operation
 was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -3180,13 +3151,15 @@
 <return> %TRUE if all directories have been successfully created, %FALSE
 otherwise.
 
-Since: 2.18
 </return>
 </function>
 
 <function name="g_buffered_input_stream_peek_buffer">
 <description>
-Returns: read-only buffer
+Returns the buffer with the currently available bytes. The returned
+buffer must not be modified and will become invalid when reading from
+the stream or filling the buffer.
+
 
 </description>
 <parameters>
@@ -3203,23 +3176,6 @@
 </return>
 </function>
 
-<function name="GDrive">
-<description>
-Emitted when the physical stop button (if any) of a drive has
-been pressed.
-
-Since: 2.22
-
-</description>
-<parameters>
-<parameter name="drive">
-<parameter_description> a #GDrive.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_mount_enclosing_volume_finish">
 <description>
 Finishes a mount operation started by g_file_mount_enclosing_volume().
@@ -3251,6 +3207,7 @@
 Creates a new #GThreadedSocketService with no listeners. Listeners
 must be added with g_socket_service_add_listeners().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -3262,7 +3219,6 @@
 </parameters>
 <return> a new #GSocketService.
 
-Since: 2.22
 </return>
 </function>
 
@@ -3405,6 +3361,18 @@
 </return>
 </function>
 
+<function name="descriptors">
+<description>
+It may be wrapped in a #GUnixFDMessage and sent over a #GSocket in
+the %G_SOCKET_ADDRESS_UNIX family by using g_socket_send_message()
+and received using g_socket_receive_message().
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_mount_get_root">
 <description>
 Gets the root directory on @mount.
@@ -3444,6 +3412,7 @@
 readable status. Reading to unset the readable status is done
 with g_cancellable_reset().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -3459,7 +3428,6 @@
 <return> %TRUE if @pollfd was successfully initialized, %FALSE on 
 failure to prepare the cancellable.
 
-Since: 2.22
 </return>
 </function>
 
@@ -3502,32 +3470,28 @@
 </return>
 </function>
 
-<function name="GSocketService">
+<function name="g_file_input_stream_query_info_finish">
 <description>
-The ::incoming signal is emitted when a new incoming connection
-to @service needs to be handled. The handler must initiate the
-handling of @connection, but may not block; in essence,
-asynchronous operations must be used.
+Finishes an asynchronous info query operation.
 
 
 </description>
 <parameters>
-<parameter name="service">
-<parameter_description> the #GSocketService.
+<parameter name="stream">
+<parameter_description> a #GFileInputStream.
 </parameter_description>
 </parameter>
-<parameter name="connection">
-<parameter_description> a new #GSocketConnection object.
+<parameter name="result">
+<parameter_description> a #GAsyncResult.
 </parameter_description>
 </parameter>
-<parameter name="source_object">
-<parameter_description> the source_object passed to g_socket_listener_add_address().
+<parameter name="error">
+<parameter_description> a #GError location to store the error occuring, 
+or %NULL to ignore.
 </parameter_description>
 </parameter>
 </parameters>
-<return> %TRUE to stop other handlers from being called
-
-Since: 2.22
+<return> #GFileInfo. 
 </return>
 </function>
 
@@ -3536,6 +3500,7 @@
 Finishes unmounting a mount. If any errors occurred during the operation,
 @error will be set to contain the errors and %FALSE will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -3555,7 +3520,6 @@
 </parameters>
 <return> %TRUE if the mount was successfully unmounted. %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -3641,31 +3605,6 @@
 </return>
 </function>
 
-<function name="g_file_input_stream_query_info_finish">
-<description>
-Finishes an asynchronous info query operation.
-
-
-</description>
-<parameters>
-<parameter name="stream">
-<parameter_description> a #GFileInputStream.
-</parameter_description>
-</parameter>
-<parameter name="result">
-<parameter_description> a #GAsyncResult.
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> a #GError location to store the error occuring, 
-or %NULL to ignore.
-</parameter_description>
-</parameter>
-</parameters>
-<return> #GFileInfo. 
-</return>
-</function>
-
 <function name="g_seekable_seek">
 <description>
 Seeks in the stream by the given @offset, modified by @type.
@@ -3742,6 +3681,68 @@
 </return>
 </function>
 
+<function name="g_inet_address_get_family">
+<description>
+Gets @address's family
+
+Since: 2.22
+
+</description>
+<parameters>
+<parameter name="address">
+<parameter_description> a #GInetAddress
+</parameter_description>
+</parameter>
+</parameters>
+<return> @address's family
+
+</return>
+</function>
+
+<function name="g_resolver_lookup_service_async">
+<description>
+Begins asynchronously performing a DNS SRV lookup for the given
+@service and @protocol in the given @domain, and eventually calls
+@callback, which must call g_resolver_lookup_service_finish() to
+get the final result. See g_resolver_lookup_service() for more
+details.
+
+Since: 2.22
+
+</description>
+<parameters>
+<parameter name="resolver">
+<parameter_description> a #GResolver
+</parameter_description>
+</parameter>
+<parameter name="service">
+<parameter_description> the service type to look up (eg, &quot;ldap&quot;)
+</parameter_description>
+</parameter>
+<parameter name="protocol">
+<parameter_description> the networking protocol to use for @service (eg, &quot;tcp&quot;)
+</parameter_description>
+</parameter>
+<parameter name="domain">
+<parameter_description> the DNS domain to look up the service in
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> a #GCancellable, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="callback">
+<parameter_description> callback to call after resolution completes
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> data for @callback
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_data_input_stream_get_newline_type">
 <description>
 Gets the current newline type for the @stream.
@@ -3763,6 +3764,7 @@
 Finishes ejecting a volume. If any errors occurred during the operation,
 @error will be set to contain the errors and %FALSE will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -3782,7 +3784,6 @@
 </parameters>
 <return> %TRUE if the volume was successfully ejected. %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -3790,6 +3791,7 @@
 <description>
 Gets the #GConverter that is used by @converter_stream.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -3800,7 +3802,6 @@
 </parameters>
 <return> the converter of the converter output stream
 
-Since: 2.24
 </return>
 </function>
 
@@ -3938,6 +3939,7 @@
 returned. If the address type is not known on the system
 then a %G_IO_ERROR_NOT_SUPPORTED error is returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -3962,7 +3964,6 @@
 </parameters>
 <return> %TRUE if @dest was filled in, %FALSE on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -4003,6 +4004,7 @@
 If a local address is specified with g_socket_client_set_local_address() the
 socket will be bound to this address before connecting.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -4025,7 +4027,6 @@
 </parameters>
 <return> a #GSocketConnection on success, %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -4063,6 +4064,7 @@
 
 See g_socket_client_set_protocol() for details.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -4073,7 +4075,6 @@
 </parameters>
 <return> a #GSocketProtocol
 
-Since: 2.22
 </return>
 </function>
 
@@ -4097,6 +4098,7 @@
 <description>
 Checks if a stream is closed.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -4107,7 +4109,6 @@
 </parameters>
 <return> %TRUE if the stream is closed.
 
-Since: 2.22
 </return>
 </function>
 
@@ -4141,6 +4142,7 @@
 @protocol, and @domain. This will initially be unresolved; use the
 #GSocketConnectable interface to resolve it.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -4159,35 +4161,31 @@
 </parameters>
 <return> a new #GNetworkService
 
-Since: 2.22
 </return>
 </function>
 
-<function name="GZlibDecompressor">
-<description>
-Zlib decompression
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
-<function name="g_inet_address_get_family">
+<function name="g_data_input_stream_read_byte">
 <description>
-Gets @address's family
+Reads an unsigned 8-bit/1-byte value from @stream.
 
 
 </description>
 <parameters>
-<parameter name="address">
-<parameter_description> a #GInetAddress
+<parameter name="stream">
+<parameter_description> a given #GDataInputStream.
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore.
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> #GError for error reporting.
 </parameter_description>
 </parameter>
 </parameters>
-<return> @address's family
-
-Since: 2.22
+<return> an unsigned 8-bit/1-byte value read from the @stream or %0 
+if an error occurred.
 </return>
 </function>
 
@@ -4221,6 +4219,7 @@
 <description>
 Finishes an async connect operation. See g_socket_client_connect_to_host_async()
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -4240,7 +4239,6 @@
 </parameters>
 <return> a #GSocketConnection on success, %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -4404,6 +4402,7 @@
 manage shadow mounts (and shadows the underlying mount) if the
 activation root on a #GVolume is set.
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -4414,42 +4413,27 @@
 </parameters>
 <return> %TRUE if @mount is shadowed.
 
-Since: 2.20
 </return>
 </function>
 
-<function name="g_io_scheduler_push_job">
+<function name="g_file_info_set_attribute_int64">
 <description>
-Schedules the I/O job to run. 
-
-@notify will be called on @user_data after @job_func has returned,
-regardless whether the job was cancelled or has run to completion.
+Sets the @attribute to contain the given @attr_value, 
+if possible.
 
-If @cancellable is not %NULL, it can be used to cancel the I/O job
-by calling g_cancellable_cancel() or by calling 
-g_io_scheduler_cancel_all_jobs().
 
 </description>
 <parameters>
-<parameter name="job_func">
-<parameter_description> a #GIOSchedulerJobFunc.
-</parameter_description>
-</parameter>
-<parameter name="user_data">
-<parameter_description> data to pass to @job_func
-</parameter_description>
-</parameter>
-<parameter name="notify">
-<parameter_description> a #GDestroyNotify for @user_data, or %NULL
+<parameter name="info">
+<parameter_description> a #GFileInfo.
 </parameter_description>
 </parameter>
-<parameter name="io_priority">
-<parameter_description> the &lt;link linkend=&quot;gioscheduler&quot;&gt;I/O priority&lt;/link&gt; 
-of the request.
+<parameter name="attribute">
+<parameter_description> attribute name to set.
 </parameter_description>
 </parameter>
-<parameter name="cancellable">
-<parameter_description> optional #GCancellable object, %NULL to ignore.
+<parameter name="attr_value">
+<parameter_description> int64 value to set attribute to.
 </parameter_description>
 </parameter>
 </parameters>
@@ -4528,33 +4512,6 @@
 </return>
 </function>
 
-<function name="g_file_enumerator_next_files_finish">
-<description>
-Finishes the asynchronous operation started with g_file_enumerator_next_files_async().
-
-
-</description>
-<parameters>
-<parameter name="enumerator">
-<parameter_description> a #GFileEnumerator.
-</parameter_description>
-</parameter>
-<parameter name="result">
-<parameter_description> a #GAsyncResult.
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> a #GError location to store the error occuring, or %NULL to 
-ignore.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GList of #GFileInfo&lt;!----&gt;s. You must free the list with 
-g_list_free() and unref the infos with g_object_unref() when you're 
-done with them.
-</return>
-</function>
-
 <function name="g_mount_remount_finish">
 <description>
 Finishes remounting a mount. If any errors occurred during the operation, 
@@ -4648,42 +4605,10 @@
 <return></return>
 </function>
 
-<function name="g_network_service_get_domain">
-<description>
-Gets the domain that @srv serves. This might be either UTF-8 or
-ASCII-encoded, depending on what @srv was created with.
-
-
-</description>
-<parameters>
-<parameter name="srv">
-<parameter_description> a #GNetworkService
-</parameter_description>
-</parameter>
-</parameters>
-<return> @srv's domain name
-
-Since: 2.22
-</return>
-</function>
-
-<function name="GVolume">
-<description>
-This signal is emitted when the #GVolume have been removed. If
-the recipient is holding references to the object they should
-release them so the object can be finalized.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_query_settable_attributes">
 <description>
 Obtain the list of settable attributes for the file.
 
-Returns: a #GFileAttributeInfoList describing the settable attributes.
 
 </description>
 <parameters>
@@ -4705,17 +4630,6 @@
 </return>
 </function>
 
-<function name="GDataOutputStream">
-<description>
-Determines the byte ordering that is used when writing 
-multi-byte entities (such as integers) to the stream.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_converter_reset">
 <description>
 Resets all internal state in the converter, making it behave
@@ -4759,6 +4673,7 @@
 Gets the socket protocol id the socket was created with.
 In case the protocol is unknown, -1 is returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -4769,7 +4684,6 @@
 </parameters>
 <return> a protocol id, or -1 if unknown
 
-Since: 2.22
 </return>
 </function>
 
@@ -4893,13 +4807,13 @@
 New listeners can be added with e.g. g_socket_listener_add_address()
 or g_socket_listener_add_inet_port().
 
+Since: 2.22
 
 </description>
 <parameters>
 </parameters>
 <return> a new #GSocketListener.
 
-Since: 2.22
 </return>
 </function>
 
@@ -4925,24 +4839,38 @@
 <return></return>
 </function>
 
-<function name="g_file_info_set_attribute_int64">
+<function name="g_io_scheduler_push_job">
 <description>
-Sets the @attribute to contain the given @attr_value, 
-if possible.
+Schedules the I/O job to run. 
+
+@notify will be called on @user_data after @job_func has returned,
+regardless whether the job was cancelled or has run to completion.
 
+If @cancellable is not %NULL, it can be used to cancel the I/O job
+by calling g_cancellable_cancel() or by calling 
+g_io_scheduler_cancel_all_jobs().
 
 </description>
 <parameters>
-<parameter name="info">
-<parameter_description> a #GFileInfo.
+<parameter name="job_func">
+<parameter_description> a #GIOSchedulerJobFunc.
 </parameter_description>
 </parameter>
-<parameter name="attribute">
-<parameter_description> attribute name to set.
+<parameter name="user_data">
+<parameter_description> data to pass to @job_func
 </parameter_description>
 </parameter>
-<parameter name="attr_value">
-<parameter_description> int64 value to set attribute to.
+<parameter name="notify">
+<parameter_description> a #GDestroyNotify for @user_data, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="io_priority">
+<parameter_description> the &lt;link linkend=&quot;gioscheduler&quot;&gt;I/O priority&lt;/link&gt; 
+of the request.
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore.
 </parameter_description>
 </parameter>
 </parameters>
@@ -4955,6 +4883,7 @@
 similar to g_object_newv() but also initializes the object
 and returns %NULL, setting an error on failure.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -4982,7 +4911,6 @@
 </parameters>
 <return> a newly allocated #GObject, or %NULL on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -4990,6 +4918,7 @@
 <description>
 Creates a new #GCharsetConverter.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -5008,7 +4937,6 @@
 </parameters>
 <return> a new #GCharsetConverter or %NULL on error.
 
-Since: 2.24
 </return>
 </function>
 
@@ -5032,6 +4960,7 @@
 <description>
 Finishes an async accept operation. See g_socket_listener_accept_async()
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5055,13 +4984,15 @@
 </parameters>
 <return> a #GSocketConnection on success, %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
 <function name="g_unix_output_stream_get_close_fd">
 <description>
-Return value: %TRUE if the file descriptor is closed when done
+Returns whether the file descriptor of @stream will be
+closed when the stream is closed.
+
+Since: 2.20
 
 </description>
 <parameters>
@@ -5072,7 +5003,6 @@
 </parameters>
 <return> %TRUE if the file descriptor is closed when done
 
-Since: 2.20
 </return>
 </function>
 
@@ -5121,6 +5051,7 @@
 <description>
 Creates a new #GInetSocketAddress for @address and @port.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5135,7 +5066,6 @@
 </parameters>
 <return> a new #GInetSocketAddress
 
-Since: 2.22
 </return>
 </function>
 
@@ -5174,6 +5104,7 @@
 #GResolver already sorts the targets according to the algorithm in
 RFC 2782.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5184,7 +5115,6 @@
 </parameters>
 <return> @target's weight
 
-Since: 2.22
 </return>
 </function>
 
@@ -5203,6 +5133,7 @@
 A possible cause of failure is exceeding the per-process or
 system-wide file descriptor limit.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -5221,7 +5152,6 @@
 </parameters>
 <return> the file descriptor, or -1 in case of error
 
-Since: 2.24
 </return>
 </function>
 
@@ -5255,6 +5185,7 @@
 To set the maximum amount of outstanding clients, use
 g_socket_set_listen_backlog().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5269,7 +5200,6 @@
 </parameters>
 <return> %TRUE on success, %FALSE on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -5279,6 +5209,7 @@
 similar to g_object_new() but also initializes the object
 and returns %NULL, setting an error on failure.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5308,7 +5239,6 @@
 </parameters>
 <return> a newly allocated #GObject, or %NULL on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -5353,18 +5283,6 @@
 <return></return>
 </function>
 
-<function name="GMemoryOutputStream">
-<description>
-Function called with the buffer as argument when the stream is destroyed.
-
-Since: 2.24
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_volume_get_name">
 <description>
 Gets the name of @volume.
@@ -5421,6 +5339,31 @@
 <return></return>
 </function>
 
+<function name="g_output_stream_flush_finish">
+<description>
+Finishes flushing an output stream.
+
+
+</description>
+<parameters>
+<parameter name="stream">
+<parameter_description> a #GOutputStream.
+</parameter_description>
+</parameter>
+<parameter name="result">
+<parameter_description> a GAsyncResult.
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> a #GError location to store the error occuring, or %NULL to 
+ignore.
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if flush operation suceeded, %FALSE otherwise.
+</return>
+</function>
+
 <function name="g_file_info_set_attribute_byte_string">
 <description>
 Sets the @attribute to contain the given @attr_value, 
@@ -5450,6 +5393,7 @@
 identifies a host on a local network that is not connected to the
 Internet).
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5460,7 +5404,6 @@
 </parameters>
 <return> %TRUE if @address is a link-local address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -5468,6 +5411,7 @@
 <description>
 Creates a new emblem for @icon.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -5482,10 +5426,25 @@
 </parameters>
 <return> a new #GEmblem.
 
-Since: 2.18
 </return>
 </function>
 
+<function name="using">
+<description>
+g_socket_receive_message() over UNIX sockets (ie: sockets in the
+%G_SOCKET_ADDRESS_UNIX family).  The file descriptors are copied
+between processes by the kernel.
+
+For an easier way to send and receive file descriptors over
+stream-oriented UNIX sockets, see g_unix_connection_send_fd() and
+g_unix_connection_receive_fd().
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_drive_has_media">
 <description>
 Checks if the @drive has media. Note that the OS may not be polling
@@ -5572,6 +5531,7 @@
 useful if the socket has been bound to a local address,
 either explicitly or implicitly when connecting.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5587,7 +5547,6 @@
 <return> a #GSocketAddress or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -5595,6 +5554,7 @@
 <description>
 Return the UNIX file descriptor that the stream writes to.
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -5605,7 +5565,6 @@
 </parameters>
 <return> The file descriptor of @stream
 
-Since: 2.20
 </return>
 </function>
 
@@ -5657,6 +5616,7 @@
 Gets the size of the native raw binary address for @address. This
 is the size of the data that you get from g_inet_address_to_bytes().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5667,7 +5627,6 @@
 </parameters>
 <return> the number of bytes used for the native version of @address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -5678,13 +5637,13 @@
 many threads/processes, etc it should allocate for concurrent DNS
 resolutions.
 
+Since: 2.22
 
 </description>
 <parameters>
 </parameters>
 <return> the default #GResolver.
 
-Since: 2.22
 </return>
 </function>
 
@@ -5834,6 +5793,7 @@
 was cancelled, the error %G_IO_ERROR_CANCELLED will be set, and %NULL will
 be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -5856,27 +5816,9 @@
 </parameters>
 <return> a #GFileInfo for the @stream, or %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
-<function name="GMount">
-<description>
-This signal is emitted when the #GMount is about to be
-unmounted.
-
-Since: 2.22
-
-</description>
-<parameters>
-<parameter name="mount">
-<parameter_description> the object on which the signal is emitted
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_content_type_can_be_executable">
 <description>
 Checks if a content type can be executable. Note that for instance
@@ -5900,6 +5842,7 @@
 Finishes ejecting a mount. If any errors occurred during the operation, 
 @error will be set to contain the errors and %FALSE will be returned.
 
+Deprecated: 2.22: Use g_mount_eject_with_operation_finish() instead.
 
 </description>
 <parameters>
@@ -5919,21 +5862,9 @@
 </parameters>
 <return> %TRUE if the mount was successfully ejected. %FALSE otherwise.
 
-Deprecated: 2.22: Use g_mount_eject_with_operation_finish() instead.
 </return>
 </function>
 
-<function name="GUnixSocketAddress">
-<description>
-A UNIX-domain (local) socket address, corresponding to a
-&lt;type&gt;struct sockaddr_un&lt;/type&gt;.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_output_stream_set_pending">
 <description>
 Sets @stream to have actions pending. If the pending flag is
@@ -6085,6 +6016,30 @@
 </return>
 </function>
 
+<function name="g_io_modules_load_all_in_directory">
+<description>
+Loads all the modules in the specified directory.
+
+If don't require all modules to be initialized (and thus registering
+all gtypes) then you can use g_io_modules_scan_all_in_directory()
+which allows delayed/lazy loading of modules.
+
+
+</description>
+<parameters>
+<parameter name="dirname">
+<parameter_description> pathname for a directory containing modules to load.
+</parameter_description>
+</parameter>
+</parameters>
+<return> a list of #GIOModules loaded from the directory,
+All the modules are loaded into memory, if you want to
+unload them (enabling on-demand loading) you must call
+g_type_module_unuse() on all the modules. Free the list
+with g_list_free().
+</return>
+</function>
+
 <function name="g_io_extension_get_priority">
 <description>
 Gets the priority with which @extension was registered.
@@ -6148,15 +6103,24 @@
 </return>
 </function>
 
-<function name="GNetworkService">
+<function name="g_converter_output_stream_new">
 <description>
-A #GSocketConnectable for resolving a SRV record and connecting to
-that service.
+Creates a new converter output stream for the @base_stream.
+
 
 </description>
 <parameters>
+<parameter name="base_stream">
+<parameter_description> a #GOutputStream
+</parameter_description>
+</parameter>
+<parameter name="converter">
+<parameter_description> a #GConverter
+</parameter_description>
+</parameter>
 </parameters>
-<return></return>
+<return> a new #GOutputStream.
+</return>
 </function>
 
 <function name="g_app_info_get_display_name">
@@ -6164,6 +6128,7 @@
 Gets the display name of the application. The display name is often more
 descriptive to the user than the name itself.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -6175,37 +6140,9 @@
 <return> the display name of the application for @appinfo, or the name if
 no display name is available.
 
-Since: 2.24
 </return>
 </function>
 
-<function name="g_socket_set_blocking">
-<description>
-Sets the blocking mode of the socket. In blocking mode
-all operations block until they succeed or there is an error. In
-non-blocking mode all functions return results immediately or
-with a %G_IO_ERROR_WOULD_BLOCK error.
-
-All sockets are created in blocking mode. However, note that the
-platform level socket is always non-blocking, and blocking mode
-is a GSocket level feature.
-
-Since: 2.22
-
-</description>
-<parameters>
-<parameter name="socket">
-<parameter_description> a #GSocket.
-</parameter_description>
-</parameter>
-<parameter name="blocking">
-<parameter_description> Whether to use blocking I/O or not.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_io_error_from_errno">
 <description>
 Converts errno.h error codes into GIO error codes.
@@ -6258,40 +6195,11 @@
 <return></return>
 </function>
 
-<function name="g_themed_icon_new_with_default_fallbacks">
-<description>
-Creates a new themed icon for @iconname, and all the names
-that can be created by shortening @iconname at '-' characters.
-
-In the following example, @icon1 and @icon2 are equivalent:
-|[
-const char *names[] = { 
-&quot;gnome-dev-cdrom-audio&quot;,
-&quot;gnome-dev-cdrom&quot;,
-&quot;gnome-dev&quot;,
-&quot;gnome&quot;
-};
-
-icon1 = g_themed_icon_new_from_names (names, 4);
-icon2 = g_themed_icon_new_with_default_fallbacks (&quot;gnome-dev-cdrom-audio&quot;);
-]|
-
-
-</description>
-<parameters>
-<parameter name="iconname">
-<parameter_description> a string containing an icon name
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GThemedIcon.
-</return>
-</function>
-
 <function name="g_file_attribute_matcher_matches_only">
 <description>
 Checks if a attribute matcher only matches a given attribute. Always
-Returns: %TRUE if the matcher only matches @attribute. %FALSE otherwise.
+returns %FALSE if &quot;*&quot; was used when creating the matcher.
+
 
 </description>
 <parameters>
@@ -6329,6 +6237,7 @@
 Creates a #GSocketAddress subclass corresponding to the native
 &lt;type&gt;struct sockaddr&lt;/type&gt; @native.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -6344,7 +6253,6 @@
 <return> a new #GSocketAddress if @native could successfully be converted,
 otherwise %NULL.
 
-Since: 2.22
 </return>
 </function>
 
@@ -6352,6 +6260,7 @@
 <description>
 Get the #GFile container which is being enumerated.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -6362,7 +6271,6 @@
 </parameters>
 <return> the #GFile which is being enumerated.
 
-Since: 2.18
 </return>
 </function>
 
@@ -6435,6 +6343,7 @@
 <description>
 Tests whether @address is a node-local multicast address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -6445,7 +6354,6 @@
 </parameters>
 <return> %TRUE if @address is a node-local multicast address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -6453,6 +6361,7 @@
 <description>
 Finishes starting a drive.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -6472,21 +6381,9 @@
 <return> %TRUE if the drive has been started successfully,
 %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
-<function name="GNetworkAddress">
-<description>
-A #GSocketConnectable for resolving a hostname and connecting to
-that host.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_cancellable_push_current">
 <description>
 Pushes @cancellable onto the cancellable stack. The current
@@ -6573,7 +6470,13 @@
 
 <function name="get_all_desktop_entries_for_mime_type">
 <description>
-Return value: a #GList containing the desktop ids which claim
+Returns all the desktop ids for @mime_type. The desktop files
+are listed in an order so that default applications are listed before
+non-default ones, and handlers for inherited mimetypes are listed
+after the base ones.
+
+Optionally doesn't list the desktop ids given in the @except 
+
 
 </description>
 <parameters>
@@ -6595,6 +6498,7 @@
 <description>
 Gets the socket family type of @address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -6605,7 +6509,6 @@
 </parameters>
 <return> the socket family type of @address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -6643,9 +6546,46 @@
 <return></return>
 </function>
 
+<function name="g_network_service_get_domain">
+<description>
+Gets the domain that @srv serves. This might be either UTF-8 or
+ASCII-encoded, depending on what @srv was created with.
+
+Since: 2.22
+
+</description>
+<parameters>
+<parameter name="srv">
+<parameter_description> a #GNetworkService
+</parameter_description>
+</parameter>
+</parameters>
+<return> @srv's domain name
+
+</return>
+</function>
+
 <function name="g_unix_fd_message_steal_fds">
 <description>
-Returns: an array of file descriptors
+Returns the array of file descriptors that is contained in this
+object.
+
+After this call, the descriptors are no longer contained in
+@message. Further calls will return an empty list (unless more
+descriptors have been added).
+
+The return result of this function must be freed with g_free().
+The caller is also responsible for closing all of the file
+descriptors.
+
+If @length is non-%NULL then it is set to the number of file
+descriptors in the returned array. The returned array is also
+terminated with -1.
+
+This function never returns %NULL. In case there are no file
+descriptors contained in @message, an empty array is returned.
+
+Since: 2.22
 
 </description>
 <parameters>
@@ -6660,7 +6600,6 @@
 </parameters>
 <return> an array of file descriptors
 
-Since: 2.22
 </return>
 </function>
 
@@ -6705,6 +6644,7 @@
 If @cancellable is cancelled before the condition is met then %FALSE
 is returned and @error, if non-%NULL, is set to %G_IO_ERROR_CANCELLED.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -6727,7 +6667,6 @@
 </parameters>
 <return> %TRUE if the condition was met, %FALSE otherwise
 
-Since: 2.22
 </return>
 </function>
 
@@ -6735,6 +6674,7 @@
 <description>
 Gives back the icon from @emblem.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -6746,7 +6686,6 @@
 <return> a #GIcon. The returned object belongs to the emblem
 and should not be modified or freed.
 
-Since: 2.18
 </return>
 </function>
 
@@ -6766,43 +6705,6 @@
 </return>
 </function>
 
-<function name="g_socket_client_connect_to_service_async">
-<description>
-This is the asynchronous version of
-g_socket_client_connect_to_service().
-
-Since: 2.22
-
-</description>
-<parameters>
-<parameter name="client">
-<parameter_description> a #GSocketClient
-</parameter_description>
-</parameter>
-<parameter name="domain">
-<parameter_description> a domain name
-</parameter_description>
-</parameter>
-<parameter name="service">
-<parameter_description> the name of the service to connect to
-</parameter_description>
-</parameter>
-<parameter name="cancellable">
-<parameter_description> a #GCancellable, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="callback">
-<parameter_description> a #GAsyncReadyCallback
-</parameter_description>
-</parameter>
-<parameter name="user_data">
-<parameter_description> user data for the callback
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_info_set_symlink_target">
 <description>
 Sets the %G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET attribute in the file info 
@@ -6827,6 +6729,7 @@
 Gets the length of @list (ie: the number of file descriptors
 contained within).
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -6837,7 +6740,6 @@
 </parameters>
 <return> the length of @list
 
-Since: 2.24
 </return>
 </function>
 
@@ -6878,33 +6780,6 @@
 </return>
 </function>
 
-<function name="GThreadedSocketService">
-<description>
-The ::run signal is emitted in a worker thread in response to an
-incoming connection. This thread is dedicated to handling
-@connection and may perform blocking IO. The signal handler need
-not return until the connection is closed.
-
-
-</description>
-<parameters>
-<parameter name="service">
-<parameter_description> the #GThreadedSocketService.
-</parameter_description>
-</parameter>
-<parameter name="connection">
-<parameter_description> a new #GSocketConnection object.
-</parameter_description>
-</parameter>
-<parameter name="source_object">
-<parameter_description> the source_object passed to g_socket_listener_add_address().
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE to stope further signal handlers from being called
-</return>
-</function>
-
 <function name="g_socket_client_connect_to_service">
 <description>
 Attempts to create a TCP connection to a service.
@@ -6989,6 +6864,7 @@
 No other types of sockets are currently considered as being capable
 of speaking IPv4.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -6999,7 +6875,6 @@
 </parameters>
 <return> %TRUE if this socket can be used with IPv4.
 
-Since: 2.22
 </return>
 </function>
 
@@ -7009,6 +6884,7 @@
 already set or @stream is closed, it will return %FALSE and set
 @error.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7024,13 +6900,31 @@
 </parameters>
 <return> %TRUE if pending was previously unset and is now set.
 
-Since: 2.22
 </return>
 </function>
 
 <function name="g_unix_fd_list_steal_fds">
 <description>
-Returns: an array of file descriptors
+Returns the array of file descriptors that is contained in this
+object.
+
+After this call, the descriptors are no longer contained in
+@list. Further calls will return an empty list (unless more
+descriptors have been added).
+
+The return result of this function must be freed with g_free().
+The caller is also responsible for closing all of the file
+descriptors.  The file descriptors in the array are set to
+close-on-exec.
+
+If @length is non-%NULL then it is set to the number of file
+descriptors in the returned array. The returned array is also
+terminated with -1.
+
+This function never returns %NULL. In case there are no file
+descriptors contained in @list, an empty array is returned.
+
+Since: 2.24
 
 </description>
 <parameters>
@@ -7045,7 +6939,23 @@
 </parameters>
 <return> an array of file descriptors
 
-Since: 2.24
+</return>
+</function>
+
+<function name="g_mount_operation_get_choice">
+<description>
+Gets a choice from the mount operation.
+
+
+</description>
+<parameters>
+<parameter name="op">
+<parameter_description> a #GMountOperation.
+</parameter_description>
+</parameter>
+</parameters>
+<return> an integer containing an index of the user's choice from 
+the choice's list, or %0.
 </return>
 </function>
 
@@ -7154,27 +7064,6 @@
 </return>
 </function>
 
-<function name="g_unix_output_stream_set_close_fd">
-<description>
-Sets whether the file descriptor of @stream shall be closed
-when the stream is closed.
-
-Since: 2.20
-
-</description>
-<parameters>
-<parameter name="stream">
-<parameter_description> a #GUnixOutputStream
-</parameter_description>
-</parameter>
-<parameter name="close_fd">
-<parameter_description> %TRUE to close the file descriptor when done
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_mount_get_drive">
 <description>
 Gets the drive for the @mount.
@@ -7269,6 +7158,7 @@
 To create abstract socket addresses, on systems that support that,
 use g_unix_socket_address_new_abstract().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7279,28 +7169,33 @@
 </parameters>
 <return> a new #GUnixSocketAddress
 
-Since: 2.22
 </return>
 </function>
 
-<function name="g_volume_monitor_get_mount_for_uuid">
+<function name="g_file_enumerator_next_files_finish">
 <description>
-Finds a #GMount object by its UUID (see g_mount_get_uuid())
+Finishes the asynchronous operation started with g_file_enumerator_next_files_async().
 
 
 </description>
 <parameters>
-<parameter name="volume_monitor">
-<parameter_description> a #GVolumeMonitor.
+<parameter name="enumerator">
+<parameter_description> a #GFileEnumerator.
 </parameter_description>
 </parameter>
-<parameter name="uuid">
-<parameter_description> the UUID to look for
+<parameter name="result">
+<parameter_description> a #GAsyncResult.
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> a #GError location to store the error occuring, or %NULL to 
+ignore.
 </parameter_description>
 </parameter>
 </parameters>
-<return> a #GMount or %NULL if no such mount is available.
-Free the returned object with g_object_unref().
+<return> a #GList of #GFileInfo&lt;!----&gt;s. You must free the list with 
+g_list_free() and unref the infos with g_object_unref() when you're 
+done with them.
 </return>
 </function>
 
@@ -7308,6 +7203,7 @@
 <description>
 Gets a hint about how a drive can be started/stopped.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7318,7 +7214,6 @@
 </parameters>
 <return> A value from the #GDriveStartStopType enumeration.
 
-Since: 2.22
 </return>
 </function>
 
@@ -7348,6 +7243,22 @@
 </return>
 </function>
 
+<function name="g_themed_icon_new">
+<description>
+Creates a new themed icon for @iconname.
+
+
+</description>
+<parameters>
+<parameter name="iconname">
+<parameter_description> a string containing an icon name.
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new #GThemedIcon.
+</return>
+</function>
+
 <function name="g_file_set_attributes_async">
 <description>
 Asynchronously sets the attributes of @file with @info.
@@ -7397,6 +7308,7 @@
 <description>
 Tests whether @address is a global multicast address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7407,7 +7319,6 @@
 </parameters>
 <return> %TRUE if @address is a global multicast address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -7435,6 +7346,7 @@
 Finishes an asynchronous file create operation started with
 g_file_create_readwrite_async().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7454,7 +7366,6 @@
 <return> a #GFileIOStream or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -7490,6 +7401,7 @@
 only works if the client will close its connection after the server
 does.)
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7504,7 +7416,6 @@
 </parameters>
 <return> %TRUE on success, %FALSE on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -7621,7 +7532,10 @@
 
 <function name="g_unix_input_stream_get_close_fd">
 <description>
-Return value: %TRUE if the file descriptor is closed when done
+Returns whether the file descriptor of @stream will be
+closed when the stream is closed.
+
+Since: 2.20
 
 </description>
 <parameters>
@@ -7632,7 +7546,6 @@
 </parameters>
 <return> %TRUE if the file descriptor is closed when done
 
-Since: 2.20
 </return>
 </function>
 
@@ -7723,6 +7636,7 @@
 
 See g_socket_client_set_local_address() for details.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7733,7 +7647,6 @@
 </parameters>
 <return> a #GSocketAddres or %NULL. don't free
 
-Since: 2.22
 </return>
 </function>
 
@@ -7754,6 +7667,24 @@
 </return>
 </function>
 
+<function name="g_content_type_from_mime_type">
+<description>
+Tries to find a content type based on the mime type name.
+
+Since: 2.18
+
+</description>
+<parameters>
+<parameter name="mime_type">
+<parameter_description> a mime type string.
+</parameter_description>
+</parameter>
+</parameters>
+<return> Newly allocated string with content type or NULL when does not know.
+
+</return>
+</function>
+
 <function name="g_content_type_guess">
 <description>
 Guesses the content type based on example data. If the function is 
@@ -7817,19 +7748,34 @@
 <return></return>
 </function>
 
-<function name="g_socket_client_new">
+<function name="g_drive_poll_for_media">
 <description>
-Creates a new #GSocketClient with the default options.
+Asynchronously polls @drive to see if media has been inserted or removed.
 
+When the operation is finished, @callback will be called.
+You can then call g_drive_poll_for_media_finish() to obtain the
+result of the operation.
 
 </description>
 <parameters>
+<parameter name="drive">
+<parameter_description> a #GDrive.
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore.
+</parameter_description>
+</parameter>
+<parameter name="callback">
+<parameter_description> a #GAsyncReadyCallback, or %NULL.
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> user data to pass to @callback
+</parameter_description>
+</parameter>
 </parameters>
-<return> a #GSocketClient.
-Free the returned object with g_object_unref().
-
-Since: 2.22
-</return>
+<return></return>
 </function>
 
 <function name="g_file_enumerator_has_pending">
@@ -7856,6 +7802,7 @@
 
 See g_socket_send() for additional information.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -7887,7 +7834,6 @@
 <return> Number of bytes written (which may be less than @size), or -1
 on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -7962,6 +7908,7 @@
 Finish an asynchronous call started by
 g_data_input_stream_read_line_async().
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -7987,7 +7934,6 @@
 On an error, it will return %NULL and @error will be set. If there's no
 content to read, it will still return %NULL, but @error won't be set.
 
-Since: 2.20
 </return>
 </function>
 
@@ -8007,30 +7953,6 @@
 </return>
 </function>
 
-<function name="SECTION">
-<description>
-#GFileIcon specifies an icon by pointing to an image file
-to be used as icon.
-
-
-</description>
-<parameters>
-<parameter name="short_description">
-<parameter_description> Icons pointing to an image file
-</parameter_description>
-</parameter>
-<parameter name="include">
-<parameter_description> gio/gio.h
-</parameter_description>
-</parameter>
-<parameter name="see_also">
-<parameter_description> #GIcon, #GLoadableIcon
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_eject_mountable_with_operation">
 <description>
 Starts an asynchronous eject on a mountable.
@@ -8125,6 +8047,7 @@
 #GResolver already sorts the targets according to the algorithm in
 RFC 2782.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8135,44 +8058,6 @@
 </parameters>
 <return> @target's priority
 
-Since: 2.22
-</return>
-</function>
-
-<function name="GVolumeMonitor">
-<description>
-Emitted when the stop button is pressed on @drive.
-
-Since: 2.22
-
-</description>
-<parameters>
-<parameter name="volume_monitor">
-<parameter_description> The volume monitor emitting the signal.
-</parameter_description>
-</parameter>
-<parameter name="drive">
-<parameter_description> the drive where the stop button was pressed
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="g_mount_operation_get_choice">
-<description>
-Gets a choice from the mount operation.
-
-
-</description>
-<parameters>
-<parameter name="op">
-<parameter_description> a #GMountOperation.
-</parameter_description>
-</parameter>
-</parameters>
-<return> an integer containing an index of the user's choice from 
-the choice's list, or %0.
 </return>
 </function>
 
@@ -8180,6 +8065,7 @@
 <description>
 Creates a new #GZlibDecompressor.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -8190,7 +8076,6 @@
 </parameters>
 <return> a new #GZlibDecompressor
 
-Since: 2.24
 </return>
 </function>
 
@@ -8231,6 +8116,7 @@
 Creates a #GSocketConnection subclass of the right type for
 @socket.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8241,40 +8127,9 @@
 </parameters>
 <return> a #GSocketConnection
 
-Since: 2.22
 </return>
 </function>
 
-<function name="g_drive_poll_for_media">
-<description>
-Asynchronously polls @drive to see if media has been inserted or removed.
-
-When the operation is finished, @callback will be called.
-You can then call g_drive_poll_for_media_finish() to obtain the
-result of the operation.
-
-</description>
-<parameters>
-<parameter name="drive">
-<parameter_description> a #GDrive.
-</parameter_description>
-</parameter>
-<parameter name="cancellable">
-<parameter_description> optional #GCancellable object, %NULL to ignore.
-</parameter_description>
-</parameter>
-<parameter name="callback">
-<parameter_description> a #GAsyncReadyCallback, or %NULL.
-</parameter_description>
-</parameter>
-<parameter name="user_data">
-<parameter_description> user data to pass to @callback
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_trash">
 <description>
 Sends @file to the &quot;Trashcan&quot;, if possible. This is similar to
@@ -8311,13 +8166,13 @@
 <description>
 Creates a new #GUnixFDList containing no file descriptors.
 
+Since: 2.24
 
 </description>
 <parameters>
 </parameters>
 <return> a new #GUnixFDList
 
-Since: 2.24
 </return>
 </function>
 
@@ -8326,6 +8181,7 @@
 Gets @addr's hostname. This might be either UTF-8 or ASCII-encoded,
 depending on what @addr was created with.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8336,7 +8192,6 @@
 </parameters>
 <return> @addr's hostname
 
-Since: 2.22
 </return>
 </function>
 
@@ -8393,6 +8248,7 @@
 Finish an asynchronous unmount operation that was started
 with g_file_unmount_mountable_with_operation().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8412,7 +8268,6 @@
 <return> %TRUE if the operation finished successfully. %FALSE
 otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -8457,17 +8312,6 @@
 </return>
 </function>
 
-<function name="GSocketAddress">
-<description>
-A socket endpoint address, corresponding to &lt;type&gt;struct sockaddr&lt;/type&gt;
-or one of its subtypes.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_set_attribute_byte_string">
 <description>
 Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING to @value. 
@@ -8513,7 +8357,8 @@
 
 <function name="g_file_monitor_is_cancelled">
 <description>
-Returns: %TRUE if monitor is canceled. %FALSE otherwise.
+Returns whether the monitor is canceled.
+
 
 </description>
 <parameters>
@@ -8614,6 +8459,7 @@
 
 If no type is registered, the #GSocketConnection base type is returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8632,7 +8478,6 @@
 </parameters>
 <return> a #GType
 
-Since: 2.22
 </return>
 </function>
 
@@ -8720,6 +8565,7 @@
 where you close the sending side, then wait for the other side to close
 the connection, thus ensuring that the other side saw all sent data.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8742,7 +8588,6 @@
 </parameters>
 <return> %TRUE on success, %FALSE on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -8774,6 +8619,7 @@
 <description>
 Tests whether @address is the loopback address for its family.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8784,7 +8630,6 @@
 </parameters>
 <return> %TRUE if @address is the loopback address for its family.
 
-Since: 2.22
 </return>
 </function>
 
@@ -8811,6 +8656,7 @@
 Finish an asynchronous stop operation that was started
 with g_file_stop_mountable().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8830,7 +8676,6 @@
 <return> %TRUE if the operation finished successfully. %FALSE
 otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -8843,6 +8688,7 @@
 The attribute must exist in @info for this to work. Otherwise %FALSE
 is returned and @info is unchanged.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -8861,7 +8707,6 @@
 </parameters>
 <return> %TRUE if the status was changed, %FALSE if the key was not set.
 
-Since: 2.22
 </return>
 </function>
 
@@ -8937,6 +8782,7 @@
 <description>
 Creates a new emblemed icon for @icon with the emblem @emblem.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -8951,7 +8797,6 @@
 </parameters>
 <return> a new #GIcon
 
-Since: 2.18
 </return>
 </function>
 
@@ -8967,54 +8812,7 @@
 </parameter_description>
 </parameter>
 </parameters>
-<return> the default #GIcon for @appinfo.
-</return>
-</function>
-
-<function name="g_volume_get_activation_root">
-<description>
-Gets the activation root for a #GVolume if it is known ahead of
-mount time. Returns %NULL otherwise. If not %NULL and if @volume
-is mounted, then the result of g_mount_get_root() on the
-#GMount object obtained from g_volume_get_mount() will always
-either be equal or a prefix of what this function returns. In
-other words, in code
-
-&lt;programlisting&gt;
-GMount *mount;
-GFile *mount_root
-GFile *volume_activation_root;
-
-mount = g_volume_get_mount (volume); /* mounted, so never NULL */
-mount_root = g_mount_get_root (mount);
-volume_activation_root = g_volume_get_activation_root(volume); /* assume not NULL */
-&lt;/programlisting&gt;
-
-then the expression
-
-&lt;programlisting&gt;
-(g_file_has_prefix (volume_activation_root, mount_root) ||
-      g_file_equal (volume_activation_root, mount_root))
-&lt;/programlisting&gt;
-
-will always be %TRUE.
-
-Activation roots are typically used in #GVolumeMonitor
-implementations to find the underlying mount to shadow, see
-g_mount_is_shadowed() for more details.
-
-
-</description>
-<parameters>
-<parameter name="volume">
-<parameter_description> a #GVolume
-</parameter_description>
-</parameter>
-</parameters>
-<return> the activation root of @volume or %NULL. Use
-g_object_unref() to free.
-
-Since: 2.18
+<return> the default #GIcon for @appinfo.
 </return>
 </function>
 
@@ -9094,6 +8892,7 @@
 Finishes an asynchronous eject operation started by 
 g_file_eject_mountable().
 
+Deprecated: 2.22: Use g_file_eject_mountable_with_operation_finish() instead.
 
 </description>
 <parameters>
@@ -9113,13 +8912,13 @@
 <return> %TRUE if the @file was ejected successfully. %FALSE 
 otherwise.
 
-Deprecated: 2.22: Use g_file_eject_mountable_with_operation_finish() instead.
 </return>
 </function>
 
 <function name="g_local_vfs_new">
 <description>
-Returns: a new #GVfs handle.
+Returns a new #GVfs handle for a local vfs.
+
 
 </description>
 <parameters>
@@ -9128,18 +8927,6 @@
 </return>
 </function>
 
-<function name="GUnixInputStream">
-<description>
-Whether to close the file descriptor when the stream is closed.
-
-Since: 2.20
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_volume_eject">
 <description>
 Ejects a volume. This is an asynchronous operation, and is
@@ -9330,7 +9117,9 @@
 
 <function name="g_filter_output_stream_get_close_base_stream">
 <description>
-Return value: %TRUE if the base stream will be closed.
+Returns whether the base stream will be closed when @stream is
+closed.
+
 
 </description>
 <parameters>
@@ -9489,10 +9278,43 @@
 </return>
 </function>
 
+<function name="g_file_enumerator_next_file">
+<description>
+Returns information for the next file in the enumerated object.
+Will block until the information is available. The #GFileInfo 
+returned from this function will contain attributes that match the 
+attribute string that was passed when the #GFileEnumerator was created.
+
+On error, returns %NULL and sets @error to the error. If the
+enumerator is at the end, %NULL will be returned and @error will
+be unset.
+
+
+</description>
+<parameters>
+<parameter name="enumerator">
+<parameter_description> a #GFileEnumerator.
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore.
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> location to store the error occuring, or %NULL to ignore
+</parameter_description>
+</parameter>
+</parameters>
+<return> A #GFileInfo or %NULL on error or end of enumerator.
+Free the returned object with g_object_unref() when no longer needed.
+</return>
+</function>
+
 <function name="g_charset_converter_get_use_fallback">
 <description>
 Gets the #GCharsetConverter:use-fallback property.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -9503,7 +9325,6 @@
 </parameters>
 <return> %TRUE if fallbacks are used by @converter
 
-Since: 2.24
 </return>
 </function>
 
@@ -9544,6 +9365,7 @@
 <description>
 Closes a stream.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -9563,7 +9385,6 @@
 </parameters>
 <return> %TRUE if stream was successfully closed, %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -9652,6 +9473,7 @@
 to produce as much output as possible and then return an error
 (typically %G_IO_ERROR_PARTIAL_INPUT).
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -9694,7 +9516,6 @@
 </parameters>
 <return> a #GConverterResult, %G_CONVERTER_ERROR on error.
 
-Since: 2.24
 </return>
 </function>
 
@@ -9742,43 +9563,26 @@
 <return></return>
 </function>
 
-<function name="GDataStream">
+<function name="that">
 <description>
-The :newline-type property determines what is considered
-as a line ending when reading complete lines from the stream.
+dispatching the connection to it by emitting the ::run signal in
+the new thread.
 
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
+The signal handler may perform blocking IO and need not return
+until the connection is closed.
 
-<function name="g_data_output_stream_put_byte">
-<description>
-Puts a byte into the output stream.
+The service is implemented using a thread pool, so there is a
+limited amount of threads availible to serve incomming requests.
+The service automatically stops the #GSocketService from accepting
+new connections when all threads are busy.
 
+As with #GSocketService, you may connect to #GThreadedSocketService:run,
+or subclass and override the default handler.
 
 </description>
 <parameters>
-<parameter name="stream">
-<parameter_description> a #GDataOutputStream.
-</parameter_description>
-</parameter>
-<parameter name="data">
-<parameter_description> a #guchar.
-</parameter_description>
-</parameter>
-<parameter name="cancellable">
-<parameter_description> optional #GCancellable object, %NULL to ignore.
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> a #GError, %NULL to ignore.
-</parameter_description>
-</parameter>
 </parameters>
-<return> %TRUE if @data was successfully added to the @stream.
-</return>
+<return></return>
 </function>
 
 <function name="g_unix_mounts_changed_since">
@@ -9802,6 +9606,7 @@
 Gets the keepalive mode of the socket. For details on this,
 see g_socket_set_keepalive().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -9812,7 +9617,6 @@
 </parameters>
 <return> %TRUE if keepalive is active, %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -9847,20 +9651,11 @@
 </return>
 </function>
 
-<function name="GFileIcon">
-<description>
-The file containing the icon.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_socket_client_connect_to_service_finish">
 <description>
 Finishes an async connect operation. See g_socket_client_connect_to_service_async()
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -9880,7 +9675,27 @@
 </parameters>
 <return> a #GSocketConnection on success, %NULL on error.
 
-Since: 2.22
+</return>
+</function>
+
+<function name="g_output_stream_is_closing">
+<description>
+Checks if an output stream is being closed. This can be
+used inside e.g. a flush implementation to see if the
+flush (or other i/o operation) is called from within
+the closing operation.
+
+Since: 2.24
+
+</description>
+<parameters>
+<parameter name="stream">
+<parameter_description> a #GOutputStream.
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @stream is being closed. %FALSE otherwise.
+
 </return>
 </function>
 
@@ -9909,6 +9724,7 @@
 
 On error -1 is returned and @error is set accordingly.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -9936,7 +9752,6 @@
 </parameters>
 <return> Number of bytes read, or -1 on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -9966,6 +9781,7 @@
 <description>
 Gets @address's path.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -9976,7 +9792,6 @@
 </parameters>
 <return> %TRUE if the address is abstract, %FALSE otherwise
 
-Since: 2.22
 </return>
 </function>
 
@@ -9999,6 +9814,7 @@
 for the G_IO_OUT condition. The result of the connection can then be
 checked with g_socket_check_connect_result().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -10021,7 +9837,6 @@
 </parameters>
 <return> %TRUE if connected, %FALSE on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -10102,6 +9917,7 @@
 <description>
 Finishes ejecting a drive.
 
+Deprecated: 2.22: Use g_drive_eject_with_operation_finish() instead.
 
 </description>
 <parameters>
@@ -10121,7 +9937,6 @@
 <return> %TRUE if the drive has been ejected successfully,
 %FALSE otherwise.
 
-Deprecated: 2.22: Use g_drive_eject_with_operation_finish() instead.
 </return>
 </function>
 
@@ -10129,6 +9944,7 @@
 <description>
 Gets the socket type of the socket.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -10139,7 +9955,6 @@
 </parameters>
 <return> a #GSocketType
 
-Since: 2.22
 </return>
 </function>
 
@@ -10161,7 +9976,21 @@
 
 <function name="g_unix_fd_list_peek_fds">
 <description>
-Returns: an array of file descriptors
+Returns the array of file descriptors that is contained in this
+object.
+
+After this call, the descriptors remain the property of @list.  The
+caller must not close them and must not free the array.  The array is
+valid only until @list is changed in any way.
+
+If @length is non-%NULL then it is set to the number of file
+descriptors in the returned array. The returned array is also
+terminated with -1.
+
+This function never returns %NULL. In case there are no file
+descriptors contained in @list, an empty array is returned.
+
+Since: 2.24
 
 </description>
 <parameters>
@@ -10176,7 +10005,6 @@
 </parameters>
 <return> an array of file descriptors
 
-Since: 2.24
 </return>
 </function>
 
@@ -10239,6 +10067,7 @@
 Checks if a file info structure has an attribute in the
 specified @name_space.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -10254,7 +10083,6 @@
 <return> %TRUE if @Ginfo has an attribute in @name_space,
 %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -10263,6 +10091,7 @@
 Obtains the information whether the #GAppInfo can be deleted.
 See g_app_info_delete().
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -10273,7 +10102,6 @@
 </parameters>
 <return> %TRUE if @appinfo can be deleted
 
-Since: 2.20
 </return>
 </function>
 
@@ -10512,6 +10340,42 @@
 <return></return>
 </function>
 
+<function name="g_socket_listener_add_any_inet_port">
+<description>
+Listens for TCP connections on any available port number for both
+IPv6 and IPv4 (if each are available).
+
+This is useful if you need to have a socket for incoming connections
+but don't care about the specific port number.
+
+@source_object will be passed out in the various calls
+to accept to identify this particular source, which is
+useful if you're listening on multiple addresses and do
+different things depending on what address is connected to.
+
+Since: 2.24
+
+</description>
+<parameters>
+<parameter name="listener">
+<parameter_description> a #GSocketListener
+</parameter_description>
+</parameter>
+<parameter name="source_object">
+<parameter_description> Optional #GObject identifying this source
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> a #GError location to store the error occuring, or %NULL to
+ignore.
+</parameter_description>
+</parameter>
+</parameters>
+<return> the port number, or 0 in case of failure.
+
+</return>
+</function>
+
 <function name="g_app_info_get_default_for_uri_scheme">
 <description>
 Gets the default application for launching applications 
@@ -10585,6 +10449,7 @@
 Gets the listen backlog setting of the socket. For details on this,
 see g_socket_set_listen_backlog().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -10595,7 +10460,6 @@
 </parameters>
 <return> the maximum number of pending connections.
 
-Since: 2.22
 </return>
 </function>
 
@@ -10652,6 +10516,7 @@
 <description>
 Gets @srv's protocol name (eg, &quot;tcp&quot;).
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -10662,7 +10527,6 @@
 </parameters>
 <return> @srv's protocol name
 
-Since: 2.22
 </return>
 </function>
 
@@ -10709,6 +10573,7 @@
 <description>
 Gets @addr's port number
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -10719,10 +10584,47 @@
 </parameters>
 <return> @addr's port (which may be 0)
 
-Since: 2.22
 </return>
 </function>
 
+<function name="g_volume_eject_with_operation">
+<description>
+Ejects a volume. This is an asynchronous operation, and is
+finished by calling g_volume_eject_with_operation_finish() with the @volume
+and #GAsyncResult data returned in the @callback.
+
+Since: 2.22
+
+</description>
+<parameters>
+<parameter name="volume">
+<parameter_description> a #GVolume.
+</parameter_description>
+</parameter>
+<parameter name="flags">
+<parameter_description> flags affecting the unmount if required for eject
+</parameter_description>
+</parameter>
+<parameter name="mount_operation">
+<parameter_description> a #GMountOperation or %NULL to avoid user interaction.
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore.
+</parameter_description>
+</parameter>
+<parameter name="callback">
+<parameter_description> a #GAsyncReadyCallback, or %NULL.
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> user data passed to @callback.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_unix_fd_list_append">
 <description>
 Adds a file descriptor to @list.
@@ -10738,6 +10640,7 @@
 this index with g_unix_fd_list_get() then you will receive back a
 duplicated copy of the same file descriptor.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -10757,7 +10660,6 @@
 <return> the index of the appended fd in case of success, else -1
 (and @error is set)
 
-Since: 2.24
 </return>
 </function>
 
@@ -10899,72 +10801,34 @@
 <description>
 Creates a #GInetAddress for the &quot;any&quot; address (unassigned/&quot;don't
 care&quot;) for @family.
-
-
-</description>
-<parameters>
-<parameter name="family">
-<parameter_description> the address family
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GInetAddress corresponding to the &quot;any&quot; address
-for @family.
-
-Since: 2.22
-</return>
-</function>
-
-<function name="g_socket_listener_add_socket">
-<description>
-Adds @socket to the set of sockets that we try to accept
-new clients from. The socket must be bound to a local
-address and listened to.
-
-@source_object will be passed out in the various calls
-to accept to identify this particular source, which is
-useful if you're listening on multiple addresses and do
-different things depending on what address is connected to.
-
-
-</description>
-<parameters>
-<parameter name="listener">
-<parameter_description> a #GSocketListener
-</parameter_description>
-</parameter>
-<parameter name="socket">
-<parameter_description> a listening #GSocket
-</parameter_description>
-</parameter>
-<parameter name="source_object">
-<parameter_description> Optional #GObject identifying this source
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> #GError for error reporting, or %NULL to ignore.
+
+Since: 2.22
+
+</description>
+<parameters>
+<parameter name="family">
+<parameter_description> the address family
 </parameter_description>
 </parameter>
 </parameters>
-<return> %TRUE on success, %FALSE on error.
+<return> a new #GInetAddress corresponding to the &quot;any&quot; address
+for @family.
 
-Since: 2.22
 </return>
 </function>
 
-<function name="g_socket_listener_add_any_inet_port">
+<function name="g_socket_listener_add_socket">
 <description>
-Listens for TCP connections on any available port number for both
-IPv6 and IPv4 (if each are available).
-
-This is useful if you need to have a socket for incoming connections
-but don't care about the specific port number.
+Adds @socket to the set of sockets that we try to accept
+new clients from. The socket must be bound to a local
+address and listened to.
 
 @source_object will be passed out in the various calls
 to accept to identify this particular source, which is
 useful if you're listening on multiple addresses and do
 different things depending on what address is connected to.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -10972,19 +10836,21 @@
 <parameter_description> a #GSocketListener
 </parameter_description>
 </parameter>
+<parameter name="socket">
+<parameter_description> a listening #GSocket
+</parameter_description>
+</parameter>
 <parameter name="source_object">
 <parameter_description> Optional #GObject identifying this source
 </parameter_description>
 </parameter>
 <parameter name="error">
-<parameter_description> a #GError location to store the error occuring, or %NULL to
-ignore.
+<parameter_description> #GError for error reporting, or %NULL to ignore.
 </parameter_description>
 </parameter>
 </parameters>
-<return> the port number, or 0 in case of failure.
+<return> %TRUE on success, %FALSE on error.
 
-Since: 2.24
 </return>
 </function>
 
@@ -11046,6 +10912,7 @@
 <description>
 Gets the list of emblems for the @icon.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -11056,7 +10923,6 @@
 </parameters>
 <return> a #GList of #GEmblem &lt;!-- --&gt;s that is owned by @emblemed
 
-Since: 2.18
 </return>
 </function>
 
@@ -11088,11 +10954,27 @@
 </return>
 </function>
 
+<function name="g_socket_client_new">
+<description>
+Creates a new #GSocketClient with the default options.
+
+Since: 2.22
+
+</description>
+<parameters>
+</parameters>
+<return> a #GSocketClient.
+Free the returned object with g_object_unref().
+
+</return>
+</function>
+
 <function name="g_file_io_stream_query_info_finish">
 <description>
 Finalizes the asynchronous query started
 by g_file_io_stream_query_info_async().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11111,7 +10993,6 @@
 </parameters>
 <return> A #GFileInfo for the finished query.
 
-Since: 2.22
 </return>
 </function>
 
@@ -11214,6 +11095,7 @@
 <description>
 Creates a #GInetAddress for the loopback address for @family.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11225,32 +11107,9 @@
 <return> a new #GInetAddress corresponding to the loopback address
 for @family.
 
-Since: 2.22
 </return>
 </function>
 
-<function name="g_unix_mount_monitor_set_rate_limit">
-<description>
-Sets the rate limit to which the @mount_monitor will report
-consecutive change events to the mount and mount point entry files.
-
-Since: 2.18
-
-</description>
-<parameters>
-<parameter name="mount_monitor">
-<parameter_description> a #GUnixMountMonitor
-</parameter_description>
-</parameter>
-<parameter name="limit_msec">
-<parameter_description> a integer with the limit in milliseconds to
-poll for changes.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_file_copy">
 <description>
 Copies the file @source to the location specified by @destination.
@@ -11415,6 +11274,7 @@
 <description>
 Checks whether a socket is closed.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11425,7 +11285,6 @@
 </parameters>
 <return> %TRUE if socket is closed, %FALSE otherwise
 
-Since: 2.22
 </return>
 </function>
 
@@ -11455,6 +11314,7 @@
 Finish an asynchronous poll operation that was polled
 with g_file_poll_mountable().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11474,7 +11334,6 @@
 <return> %TRUE if the operation finished successfully. %FALSE
 otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -11559,6 +11418,7 @@
 <description>
 Creates a new #GUnixFDMessage containing @list.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -11569,7 +11429,53 @@
 </parameters>
 <return> a new #GUnixFDMessage
 
-Since: 2.24
+</return>
+</function>
+
+<function name="g_volume_get_activation_root">
+<description>
+Gets the activation root for a #GVolume if it is known ahead of
+mount time. Returns %NULL otherwise. If not %NULL and if @volume
+is mounted, then the result of g_mount_get_root() on the
+#GMount object obtained from g_volume_get_mount() will always
+either be equal or a prefix of what this function returns. In
+other words, in code
+
+&lt;programlisting&gt;
+GMount *mount;
+GFile *mount_root
+GFile *volume_activation_root;
+
+mount = g_volume_get_mount (volume); /* mounted, so never NULL */
+mount_root = g_mount_get_root (mount);
+volume_activation_root = g_volume_get_activation_root(volume); /* assume not NULL */
+&lt;/programlisting&gt;
+
+then the expression
+
+&lt;programlisting&gt;
+(g_file_has_prefix (volume_activation_root, mount_root) ||
+      g_file_equal (volume_activation_root, mount_root))
+&lt;/programlisting&gt;
+
+will always be %TRUE.
+
+Activation roots are typically used in #GVolumeMonitor
+implementations to find the underlying mount to shadow, see
+g_mount_is_shadowed() for more details.
+
+Since: 2.18
+
+</description>
+<parameters>
+<parameter name="volume">
+<parameter_description> a #GVolume
+</parameter_description>
+</parameter>
+</parameters>
+<return> the activation root of @volume or %NULL. Use
+g_object_unref() to free.
+
 </return>
 </function>
 
@@ -11652,13 +11558,13 @@
 New listeners can be added with e.g. g_socket_listener_add_address()
 or g_socket_listener_add_inet_port().
 
+Since: 2.22
 
 </description>
 <parameters>
 </parameters>
 <return> a new #GSocketService.
 
-Since: 2.22
 </return>
 </function>
 
@@ -11688,6 +11594,7 @@
 stream, as this is required for fd passing to work on some
 implementations.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11706,7 +11613,6 @@
 </parameters>
 <return> a file descriptor on success, -1 on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -11776,6 +11682,7 @@
 and can have embedded nuls). All bytes after @path_len up to the max size
 of an abstract unix domain name is filled with zero bytes.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11790,7 +11697,6 @@
 </parameters>
 <return> a new #GUnixSocketAddress
 
-Since: 2.22
 </return>
 </function>
 
@@ -11865,6 +11771,7 @@
 If there is no implementation for this kind of control message, %NULL
 will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11887,7 +11794,6 @@
 </parameters>
 <return> the deserialized message or %NULL
 
-Since: 2.22
 </return>
 </function>
 
@@ -11895,6 +11801,7 @@
 <description>
 Gets the socket family of the socket.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11905,23 +11812,6 @@
 </parameters>
 <return> a #GSocketFamily
 
-Since: 2.22
-</return>
-</function>
-
-<function name="g_unix_mount_point_get_fs_type">
-<description>
-Gets the file system type for the mount point.
-
-
-</description>
-<parameters>
-<parameter name="mount_point">
-<parameter_description> a #GUnixMountPoint.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a string containing the file system type.
 </return>
 </function>
 
@@ -11967,6 +11857,7 @@
 Finishes ejecting a drive. If any errors occurred during the operation,
 @error will be set to contain the errors and %FALSE will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -11986,7 +11877,6 @@
 </parameters>
 <return> %TRUE if the drive was successfully ejected. %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -11996,6 +11886,7 @@
 
 See g_socket_client_set_socket_type() for details.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -12006,23 +11897,6 @@
 </parameters>
 <return> a #GSocketFamily
 
-Since: 2.22
-</return>
-</function>
-
-<function name="g_themed_icon_new">
-<description>
-Creates a new themed icon for @iconname.
-
-
-</description>
-<parameters>
-<parameter name="iconname">
-<parameter_description> a string containing an icon name.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GThemedIcon.
 </return>
 </function>
 
@@ -12040,6 +11914,7 @@
 triggering the cancellable object from another thread. If the operation
 was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -12062,39 +11937,6 @@
 </parameters>
 <return> a #GSocketConnection on success, %NULL on error.
 
-Since: 2.22
-</return>
-</function>
-
-<function name="g_io_extension_point_implement">
-<description>
-Registers @type as extension for the extension point with name
-@extension_point_name. 
-
-If @type has already been registered as an extension for this 
-extension point, the existing #GIOExtension object is returned.
-
-
-</description>
-<parameters>
-<parameter name="extension_point_name">
-<parameter_description> the name of the extension point
-</parameter_description>
-</parameter>
-<parameter name="type">
-<parameter_description> the #GType to register as extension 
-</parameter_description>
-</parameter>
-<parameter name="extension_name">
-<parameter_description> the name for the extension
-</parameter_description>
-</parameter>
-<parameter name="priority">
-<parameter_description> the priority for the extension
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GIOExtension object for #GType
 </return>
 </function>
 
@@ -12153,6 +11995,7 @@
 situations such as the #GDesktopAppInfo returned from
 g_desktop_app_info_new_from_keyfile(), this function will return %NULL.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -12162,7 +12005,6 @@
 </parameter>
 </parameters>
 <return> The full path to the file for @info, or %NULL if not known.
-Since: 2.24
 </return>
 </function>
 
@@ -12294,28 +12136,22 @@
 </return>
 </function>
 
-<function name="g_output_stream_flush_finish">
+<function name="g_inet_address_to_string">
 <description>
-Finishes flushing an output stream.
+Converts @address to string form.
 
+Since: 2.22
 
 </description>
 <parameters>
-<parameter name="stream">
-<parameter_description> a #GOutputStream.
-</parameter_description>
-</parameter>
-<parameter name="result">
-<parameter_description> a GAsyncResult.
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> a #GError location to store the error occuring, or %NULL to 
-ignore.
+<parameter name="address">
+<parameter_description> a #GInetAddress
 </parameter_description>
 </parameter>
 </parameters>
-<return> %TRUE if flush operation suceeded, %FALSE otherwise.
+<return> a representation of @address as a string, which should be
+freed after use.
+
 </return>
 </function>
 
@@ -12339,6 +12175,7 @@
 socket may cause the bind call to return %G_IO_ERROR_ADDRESS_IN_USE if
 the server program is stopped and then immediately restarted.)
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -12361,7 +12198,6 @@
 </parameters>
 <return> %TRUE on success, %FALSE on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -12447,6 +12283,7 @@
 stream, as this is required for fd passing to work on some
 implementations.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -12469,7 +12306,6 @@
 </parameters>
 <return> a %TRUE on success, %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -12507,6 +12343,7 @@
 a value from #GResolverError. If the operation was cancelled,
 @error will be set to %G_IO_ERROR_CANCELLED.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -12526,7 +12363,22 @@
 <return> a hostname (either ASCII-only, or in ASCII-encoded
 form), or %NULL on error.
 
-Since: 2.22
+</return>
+</function>
+
+<function name="g_unix_mount_point_get_fs_type">
+<description>
+Gets the file system type for the mount point.
+
+
+</description>
+<parameters>
+<parameter name="mount_point">
+<parameter_description> a #GUnixMountPoint.
+</parameter_description>
+</parameter>
+</parameters>
+<return> a string containing the file system type.
 </return>
 </function>
 
@@ -12550,7 +12402,13 @@
 
 <function name="g_socket_get_fd">
 <description>
-Returns: the file descriptor of the socket.
+Returns the underlying OS socket object. On unix this
+is a socket file descriptor, and on windows this is
+a Winsock2 SOCKET handle. This may be useful for
+doing platform specific or otherwise unusual operations
+on the socket.
+
+Since: 2.22
 
 </description>
 <parameters>
@@ -12561,7 +12419,6 @@
 </parameters>
 <return> the file descriptor of the socket.
 
-Since: 2.22
 </return>
 </function>
 
@@ -12686,22 +12543,30 @@
 <return></return>
 </function>
 
-<function name="g_inet_address_to_string">
+<function name="g_drive_stop_finish">
 <description>
-Converts @address to string form.
+Finishes stopping a drive.
 
+Since: 2.22
 
 </description>
 <parameters>
-<parameter name="address">
-<parameter_description> a #GInetAddress
+<parameter name="drive">
+<parameter_description> a #GDrive.
+</parameter_description>
+</parameter>
+<parameter name="result">
+<parameter_description> a #GAsyncResult.
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> a #GError, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
-<return> a representation of @address as a string, which should be
-freed after use.
+<return> %TRUE if the drive has been stopped successfully,
+%FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -12829,6 +12694,7 @@
 Check whether the socket is connected. This is only useful for
 connection-oriented sockets.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -12839,7 +12705,6 @@
 </parameters>
 <return> %TRUE if socket is connected, %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -12868,6 +12733,7 @@
 to create a #GNetworkService and use its #GSocketConnectable
 interface.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -12900,7 +12766,6 @@
 free each of the targets and the list when you are done with it.
 (You can use g_resolver_free_targets() to do this.)
 
-Since: 2.22
 </return>
 </function>
 
@@ -12994,17 +12859,6 @@
 <return></return>
 </function>
 
-<function name="GInetSocketAddress">
-<description>
-An IPv4 or IPv6 socket address, corresponding to a &lt;type&gt;struct
-sockaddr_in&lt;/type&gt; or &lt;type&gt;struct sockaddr_in6&lt;/type&gt;.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_drive_start">
 <description>
 Asynchronously starts a drive.
@@ -13069,6 +12923,7 @@
 supported, so make sure you really need to do read and write streaming,
 rather than just opening for reading or writing.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13092,7 +12947,6 @@
 <return> a #GFileIOStream for the newly created file, or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -13118,6 +12972,7 @@
 requesting a binding to port 0 (ie: &quot;any port&quot;).  This address, if
 requested, belongs to the caller and must be freed.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13152,7 +13007,6 @@
 </parameters>
 <return> %TRUE on success, %FALSE on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -13192,6 +13046,7 @@
 <description>
 Gets the origin of the emblem.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -13202,7 +13057,6 @@
 </parameters>
 <return> the origin of the emblem
 
-Since: 2.18
 </return>
 </function>
 
@@ -13314,6 +13168,7 @@
 Gets the value of a stringv attribute. If the attribute does
 not contain a stringv, %NULL will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13329,7 +13184,6 @@
 <return> the contents of the @attribute value as a stringv, or
 %NULL otherwise. Do not free.
 
-Since: 2.22
 </return>
 </function>
 
@@ -13358,7 +13212,48 @@
 
 <function name="g_file_replace">
 <description>
-Returns: a #GFileOutputStream or %NULL on error. 
+Returns an output stream for overwriting the file, possibly
+creating a backup copy of the file first. If the file doesn't exist,
+it will be created.
+
+This will try to replace the file in the safest way possible so
+that any errors during the writing will not affect an already
+existing copy of the file. For instance, for local files it
+may write to a temporary file and then atomically rename over
+the destination when the stream is closed.
+
+By default files created are generally readable by everyone,
+but if you pass #G_FILE_CREATE_PRIVATE in @flags the file
+will be made readable only to the current user, to the level that
+is supported on the target filesystem.
+
+If @cancellable is not %NULL, then the operation can be cancelled by
+triggering the cancellable object from another thread. If the operation
+was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+
+If you pass in a non-#NULL @etag value, then this value is
+compared to the current entity tag of the file, and if they differ
+an G_IO_ERROR_WRONG_ETAG error is returned. This generally means
+that the file has been changed since you last read it. You can get
+the new etag from g_file_output_stream_get_etag() after you've
+finished writing and closed the #GFileOutputStream. When you load
+a new file you can use g_file_input_stream_query_info() to get
+the etag of the file.
+
+If @make_backup is %TRUE, this function will attempt to make a backup
+of the current file before overwriting it. If this fails a G_IO_ERROR_CANT_CREATE_BACKUP
+error will be returned. If you want to replace anyway, try again with
+@make_backup set to %FALSE.
+
+If the file is a directory the G_IO_ERROR_IS_DIRECTORY error will be returned,
+and if the file is some other form of non-regular file then a
+G_IO_ERROR_NOT_REGULAR_FILE error will be returned.
+Some file systems don't allow all file names, and may
+return an G_IO_ERROR_INVALID_FILENAME error, and if the name
+is to long G_IO_ERROR_FILENAME_TOO_LONG will be returned.
+Other errors are possible too, and depend on what kind of
+filesystem the file is on.
+
 
 </description>
 <parameters>
@@ -13409,6 +13304,7 @@
 <description>
 Tests whether @address is an organization-local multicast address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13419,7 +13315,6 @@
 </parameters>
 <return> %TRUE if @address is an organization-local multicast address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -13462,40 +13357,6 @@
 </return>
 </function>
 
-<function name="GCharsetConverter">
-<description>
-Conversions between character sets.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
-<function name="g_io_modules_load_all_in_directory">
-<description>
-Loads all the modules in the specified directory.
-
-If don't require all modules to be initialized (and thus registering
-all gtypes) then you can use g_io_modules_scan_all_in_directory()
-which allows delayed/lazy loading of modules.
-
-
-</description>
-<parameters>
-<parameter name="dirname">
-<parameter_description> pathname for a directory containing modules to load.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a list of #GIOModules loaded from the directory,
-All the modules are loaded into memory, if you want to
-unload them (enabling on-demand loading) you must call
-g_type_module_unuse() on all the modules. Free the list
-with g_list_free().
-</return>
-</function>
-
 <function name="g_socket_condition_check">
 <description>
 Checks on the readiness of @socket to perform operations.
@@ -13508,6 +13369,7 @@
 
 This call never blocks.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13522,7 +13384,6 @@
 </parameters>
 <return> the @GIOCondition mask of the current state
 
-Since: 2.22
 </return>
 </function>
 
@@ -13533,6 +13394,7 @@
 check if it contains encoded Unicode segments, and use
 g_hostname_to_unicode() to convert it if it does.)
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13543,7 +13405,6 @@
 </parameters>
 <return> @target's hostname
 
-Since: 2.22
 </return>
 </function>
 
@@ -13637,66 +13498,60 @@
 <return></return>
 </function>
 
-<function name="GInetAddress">
+<function name="g_io_extension_point_implement">
 <description>
-Whether this is a site-local multicast address.
-See g_inet_address_get_is_mc_site_local().
-
-Since: 2.22
+Registers @type as extension for the extension point with name
+@extension_point_name. 
 
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
+If @type has already been registered as an extension for this 
+extension point, the existing #GIOExtension object is returned.
 
-<function name="GResolver">
-<description>
-Emitted when the resolver notices that the system resolver
-configuration has changed.
 
 </description>
 <parameters>
-<parameter name="resolver">
-<parameter_description> a #GResolver
+<parameter name="extension_point_name">
+<parameter_description> the name of the extension point
 </parameter_description>
 </parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="g_unix_mount_is_readonly">
-<description>
-Checks if a unix mount is mounted read only.
-
-
-</description>
-<parameters>
-<parameter name="mount_entry">
-<parameter_description> a #GUnixMount.
+<parameter name="type">
+<parameter_description> the #GType to register as extension 
+</parameter_description>
+</parameter>
+<parameter name="extension_name">
+<parameter_description> the name for the extension
+</parameter_description>
+</parameter>
+<parameter name="priority">
+<parameter_description> the priority for the extension
 </parameter_description>
 </parameter>
 </parameters>
-<return> %TRUE if @mount_entry is read only.
+<return> a #GIOExtension object for #GType
 </return>
 </function>
 
-<function name="GUnixOutputStream">
+<function name="g_file_attribute_matcher_enumerate_next">
 <description>
-Whether to close the file descriptor when the stream is closed.
+Gets the next matched attribute from a #GFileAttributeMatcher.
 
-Since: 2.20
 
 </description>
 <parameters>
+<parameter name="matcher">
+<parameter_description> a #GFileAttributeMatcher.
+</parameter_description>
+</parameter>
 </parameters>
-<return></return>
+<return> a string containing the next attribute or %NULL if 
+no more attribute exist.
+</return>
 </function>
 
 <function name="g_inet_address_new_from_string">
 <description>
 Parses @string as an IP address and creates a new #GInetAddress.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13708,7 +13563,6 @@
 <return> a new #GInetAddress corresponding to @string, or %NULL if
 @string could not be parsed.
 
-Since: 2.22
 </return>
 </function>
 
@@ -13776,17 +13630,6 @@
 </return>
 </function>
 
-<function name="GMountOperation">
-<description>
-The index of the user's choice when a question is asked during the 
-mount operation. See the #GMountOperation::ask-question signal.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_mount_eject_with_operation">
 <description>
 Ejects a mount. This is an asynchronous operation, and is
@@ -13904,6 +13747,7 @@
 Gets the output stream for this object. This is used for
 writing.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13914,7 +13758,6 @@
 </parameters>
 <return> a #GOutputStream, owned by the #GIOStream. Do not free.
 
-Since: 2.22
 </return>
 </function>
 
@@ -13984,6 +13827,7 @@
 <description>
 Tests whether @address is a multicast address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -13994,7 +13838,6 @@
 </parameters>
 <return> %TRUE if @address is a multicast address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -14147,6 +13990,7 @@
 <description>
 Creates a #GSocketAddressEnumerator for @connectable.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14157,7 +14001,6 @@
 </parameters>
 <return> a new #GSocketAddressEnumerator.
 
-Since: 2.22
 </return>
 </function>
 
@@ -14165,6 +14008,7 @@
 <description>
 Return the UNIX file descriptor that the stream reads from.
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -14175,24 +14019,14 @@
 </parameters>
 <return> The file descriptor of @stream
 
-Since: 2.20
 </return>
 </function>
 
-<function name="GSrvTarget">
-<description>
-A single target host/port that a network service is running on.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_socket_client_connect_finish">
 <description>
 Finishes an async connect operation. See g_socket_client_connect_async()
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14212,7 +14046,6 @@
 </parameters>
 <return> a #GSocketConnection on success, %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -14294,6 +14127,7 @@
 (allowing them to give the hostname, and a port overide if necessary)
 and @default_port is expected to be provided by the application.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14312,7 +14146,6 @@
 </parameters>
 <return> the new #GNetworkAddress, or %NULL on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -14332,6 +14165,7 @@
 so make sure you really need to do read and write streaming, rather than
 just opening for reading or writing.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14351,7 +14185,6 @@
 <return> #GFileIOStream or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -14372,6 +14205,7 @@
 triggering the cancellable object from another thread. If the operation
 was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14394,7 +14228,6 @@
 </parameters>
 <return> a #GSocket on success, %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -14637,6 +14470,7 @@
 Gets the input stream for this object. This is used
 for reading.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14647,7 +14481,6 @@
 </parameters>
 <return> a #GInputStream, owned by the #GIOStream. Do not free.
 
-Since: 2.22
 </return>
 </function>
 
@@ -14676,6 +14509,7 @@
 
 For details, see g_unix_socket_address_get_path().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14686,7 +14520,6 @@
 </parameters>
 <return> the length of the path
 
-Since: 2.22
 </return>
 </function>
 
@@ -14843,7 +14676,13 @@
 
 <function name="g_file_query_default_handler">
 <description>
-Returns: a #GAppInfo if the handle was found, %NULL if there were errors.
+Returns the #GAppInfo that is registered as the default
+application to handle the file specified by @file.
+
+If @cancellable is not %NULL, then the operation can be cancelled by
+triggering the cancellable object from another thread. If the operation
+was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+
 
 </description>
 <parameters>
@@ -14952,6 +14791,7 @@
 <description>
 Checks if a drive can be stopped.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -14962,7 +14802,6 @@
 </parameters>
 <return> %TRUE if the @drive can be stopped, %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -14971,6 +14810,7 @@
 Gets the commandline with which the application will be
 started.  
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -14982,7 +14822,6 @@
 <return> a string containing the @appinfo's commandline, 
 or %NULL if this information is not available
 
-Since: 2.20
 </return>
 </function>
 
@@ -15012,6 +14851,7 @@
 will be set to non-blocking mode, independent on the blocking
 mode of the #GSocket.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -15027,7 +14867,6 @@
 <return> a #GSocket or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -15051,6 +14890,7 @@
 <description>
 Gets the number of fallbacks that @converter has applied so far.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -15061,7 +14901,6 @@
 </parameters>
 <return> the number of fallbacks that @converter has applied
 
-Since: 2.24
 </return>
 </function>
 
@@ -15101,6 +14940,7 @@
 
 See #GCancellable::cancelled for details on how to use this.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -15124,7 +14964,6 @@
 <return> The id of the signal handler or 0 if @cancellable has already
 been cancelled.
 
-Since: 2.22
 </return>
 </function>
 
@@ -15132,6 +14971,7 @@
 <description>
 Creates a new emblem for @icon.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -15142,7 +14982,6 @@
 </parameters>
 <return> a new #GEmblem.
 
-Since: 2.18
 </return>
 </function>
 
@@ -15151,6 +14990,7 @@
 Gets the blocking mode of the socket. For details on blocking I/O,
 see g_socket_set_blocking().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -15161,7 +15001,6 @@
 </parameters>
 <return> %TRUE if blocking I/O is used, %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -15170,6 +15009,7 @@
 Creates a new #GSocketConnectable for connecting to the given
 @hostname and @port.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -15184,7 +15024,6 @@
 </parameters>
 <return> the new #GNetworkAddress
 
-Since: 2.22
 </return>
 </function>
 
@@ -15283,26 +15122,6 @@
 </return>
 </function>
 
-<function name="g_converter_output_stream_new">
-<description>
-Creates a new converter output stream for the @base_stream.
-
-
-</description>
-<parameters>
-<parameter name="base_stream">
-<parameter_description> a #GOutputStream
-</parameter_description>
-</parameter>
-<parameter name="converter">
-<parameter_description> a #GConverter
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GOutputStream.
-</return>
-</function>
-
 <function name="g_file_info_set_is_hidden">
 <description>
 Sets the &quot;is_hidden&quot; attribute in a #GFileInfo according to @is_symlink.
@@ -15472,6 +15291,7 @@
 
 See g_socket_receive() for additional information.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -15493,42 +15313,16 @@
 </parameter_description>
 </parameter>
 <parameter name="cancellable">
-<parameter_description> a %GCancellable or %NULL
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> #GError for error reporting, or %NULL to ignore.
-</parameter_description>
-</parameter>
-</parameters>
-<return> Number of bytes read, or -1 on error
-
-Since: 2.22
-</return>
-</function>
-
-<function name="g_data_input_stream_read_byte">
-<description>
-Reads an unsigned 8-bit/1-byte value from @stream.
-
-
-</description>
-<parameters>
-<parameter name="stream">
-<parameter_description> a given #GDataInputStream.
-</parameter_description>
-</parameter>
-<parameter name="cancellable">
-<parameter_description> optional #GCancellable object, %NULL to ignore.
+<parameter_description> a %GCancellable or %NULL
 </parameter_description>
 </parameter>
 <parameter name="error">
-<parameter_description> #GError for error reporting.
+<parameter_description> #GError for error reporting, or %NULL to ignore.
 </parameter_description>
 </parameter>
 </parameters>
-<return> an unsigned 8-bit/1-byte value read from the @stream or %0 
-if an error occurred.
+<return> Number of bytes read, or -1 on error
+
 </return>
 </function>
 
@@ -15741,11 +15535,62 @@
 </return>
 </function>
 
+<function name="g_data_output_stream_put_byte">
+<description>
+Puts a byte into the output stream.
+
+
+</description>
+<parameters>
+<parameter name="stream">
+<parameter_description> a #GDataOutputStream.
+</parameter_description>
+</parameter>
+<parameter name="data">
+<parameter_description> a #guchar.
+</parameter_description>
+</parameter>
+<parameter name="cancellable">
+<parameter_description> optional #GCancellable object, %NULL to ignore.
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> a #GError, %NULL to ignore.
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @data was successfully added to the @stream.
+</return>
+</function>
+
+<function name="g_unix_mount_monitor_set_rate_limit">
+<description>
+Sets the rate limit to which the @mount_monitor will report
+consecutive change events to the mount and mount point entry files.
+
+Since: 2.18
+
+</description>
+<parameters>
+<parameter name="mount_monitor">
+<parameter_description> a #GUnixMountMonitor
+</parameter_description>
+</parameter>
+<parameter name="limit_msec">
+<parameter_description> a integer with the limit in milliseconds to
+poll for changes.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_socket_get_remote_address">
 <description>
 Try to get the remove address of a connected socket. This is only
 useful for connection oriented sockets that have been connected.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -15761,7 +15606,6 @@
 <return> a #GSocketAddress or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -15847,6 +15691,7 @@
 <description>
 Gets the main icon for @emblemed.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -15857,7 +15702,6 @@
 </parameters>
 <return> a #GIcon that is owned by @emblemed
 
-Since: 2.18
 </return>
 </function>
 
@@ -15867,6 +15711,7 @@
 
 See g_socket_client_set_family() for details.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -15877,7 +15722,6 @@
 </parameters>
 <return> a #GSocketFamily
 
-Since: 2.22
 </return>
 </function>
 
@@ -15947,17 +15791,26 @@
 </return>
 </function>
 
+<function name="to">
+<description>
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_resolver_error_quark">
 <description>
 Gets the #GResolver Error Quark.
 
+Since: 2.22
 
 </description>
 <parameters>
 </parameters>
 <return> a #GQuark.
 
-Since: 2.22
 </return>
 </function>
 
@@ -16082,6 +15935,36 @@
 <return></return>
 </function>
 
+<function name="g_themed_icon_new_with_default_fallbacks">
+<description>
+Creates a new themed icon for @iconname, and all the names
+that can be created by shortening @iconname at '-' characters.
+
+In the following example, @icon1 and @icon2 are equivalent:
+|[
+const char *names[] = { 
+&quot;gnome-dev-cdrom-audio&quot;,
+&quot;gnome-dev-cdrom&quot;,
+&quot;gnome-dev&quot;,
+&quot;gnome&quot;
+};
+
+icon1 = g_themed_icon_new_from_names (names, 4);
+icon2 = g_themed_icon_new_with_default_fallbacks (&quot;gnome-dev-cdrom-audio&quot;);
+]|
+
+
+</description>
+<parameters>
+<parameter name="iconname">
+<parameter_description> a string containing an icon name
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new #GThemedIcon.
+</return>
+</function>
+
 <function name="g_mount_get_name">
 <description>
 Gets the name of @mount.
@@ -16159,11 +16042,29 @@
 </return>
 </function>
 
+<function name="g_app_info_get_all_for_type">
+<description>
+Gets a list of all #GAppInfo&lt;!-- --&gt;s for a given content type.
+
+
+</description>
+<parameters>
+<parameter name="content_type">
+<parameter_description> the content type to find a #GAppInfo for
+</parameter_description>
+</parameter>
+</parameters>
+<return> #GList of #GAppInfo&lt;!-- --&gt;s for given @content_type
+or %NULL on error.
+</return>
+</function>
+
 <function name="g_mount_eject_with_operation_finish">
 <description>
 Finishes ejecting a mount. If any errors occurred during the operation,
 @error will be set to contain the errors and %FALSE will be returned.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16183,7 +16084,6 @@
 </parameters>
 <return> %TRUE if the mount was successfully ejected. %FALSE otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -16246,6 +16146,7 @@
 
 On error -1 is returned and @error is set accordingly.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16273,7 +16174,6 @@
 <return> Number of bytes written (which may be less than @size), or -1
 on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -16307,24 +16207,6 @@
 </return>
 </function>
 
-<function name="g_volume_get_drive">
-<description>
-Gets the drive for the @volume.
-
-
-</description>
-<parameters>
-<parameter name="volume">
-<parameter_description> a #GVolume.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GDrive or %NULL if @volume is not associated with a drive.
-The returned object should be unreffed with g_object_unref()
-when no longer needed.
-</return>
-</function>
-
 <function name="g_desktop_app_info_lookup_get_default_for_uri_scheme">
 <description>
 Gets the default application for launching applications 
@@ -16380,6 +16262,7 @@
 Finishes an asynchronous file read operation started with
 g_file_open_readwrite_async().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16399,7 +16282,6 @@
 <return> a #GFileIOStream or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -16463,6 +16345,7 @@
 system, so you can use protocols not listed in #GSocketProtocol if you
 know the protocol number used for it.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16486,7 +16369,6 @@
 <return> a #GSocket or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -16499,6 +16381,7 @@
 a value from #GResolverError. If the operation was cancelled,
 @error will be set to %G_IO_ERROR_CANCELLED.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16518,7 +16401,27 @@
 <return> a #GList of #GSrvTarget, or %NULL on error. See
 g_resolver_lookup_service() for more details.
 
-Since: 2.22
+</return>
+</function>
+
+<function name="g_volume_monitor_get_mount_for_uuid">
+<description>
+Finds a #GMount object by its UUID (see g_mount_get_uuid())
+
+
+</description>
+<parameters>
+<parameter name="volume_monitor">
+<parameter_description> a #GVolumeMonitor.
+</parameter_description>
+</parameter>
+<parameter name="uuid">
+<parameter_description> the UUID to look for
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GMount or %NULL if no such mount is available.
+Free the returned object with g_object_unref().
 </return>
 </function>
 
@@ -16533,6 +16436,7 @@
 A possible cause of failure is exceeding the per-process or
 system-wide file descriptor limit.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16551,7 +16455,24 @@
 </parameters>
 <return> %TRUE in case of success, else %FALSE (and @error is set)
 
-Since: 2.22
+</return>
+</function>
+
+<function name="g_volume_get_drive">
+<description>
+Gets the drive for the @volume.
+
+
+</description>
+<parameters>
+<parameter name="volume">
+<parameter_description> a #GVolume.
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GDrive or %NULL if @volume is not associated with a drive.
+The returned object should be unreffed with g_object_unref()
+when no longer needed.
 </return>
 </function>
 
@@ -16559,6 +16480,7 @@
 <description>
 Gets the #GConverter that is used by @converter_stream.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -16569,7 +16491,6 @@
 </parameters>
 <return> the converter of the converter input stream
 
-Since: 2.24
 </return>
 </function>
 
@@ -16579,6 +16500,7 @@
 This must be called after the stream has been written
 and closed, as the etag can change while writing.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16589,7 +16511,6 @@
 </parameters>
 <return> the entity tag for the stream.
 
-Since: 2.22
 </return>
 </function>
 
@@ -16642,6 +16563,7 @@
 &lt;/para&gt;&lt;/listitem&gt;
 &lt;/itemizedlist&gt;
 
+Since: 2.20
 
 </description>
 <parameters>
@@ -16653,7 +16575,6 @@
 <return> An allocated NUL-terminated UTF8 string or %NULL if @icon can't
 be serialized. Use g_free() to free.
 
-Since: 2.20
 </return>
 </function>
 
@@ -16731,6 +16652,11 @@
 is to return #GVolume objects representing entries in the users
 &quot;favorite servers&quot; list or similar.
 
+Deprecated: 2.20: Instead of using this function, #GVolumeMonitor
+implementations should instead create shadow mounts with the URI of
+the mount they intend to adopt. See the proxy volume monitor in
+gvfs for an example of this. Also see g_mount_is_shadowed(),
+g_mount_shadow() and g_mount_unshadow() functions.
 
 </description>
 <parameters>
@@ -16742,11 +16668,6 @@
 <return> the #GVolume object that is the parent for @mount or %NULL
 if no wants to adopt the #GMount.
 
-Deprecated: 2.20: Instead of using this function, #GVolumeMonitor
-implementations should instead create shadow mounts with the URI of
-the mount they intend to adopt. See the proxy volume monitor in
-gvfs for an example of this. Also see g_mount_is_shadowed(),
-g_mount_shadow() and g_mount_unshadow() functions.
 </return>
 </function>
 
@@ -16781,7 +16702,10 @@
 
 <function name="g_socket_control_message_get_msg_type">
 <description>
-Returns: an integer describing the type of control message
+Returns the protocol specific type of the control message.
+For instance, for UNIX fd passing this would be SCM_RIGHTS.
+
+Since: 2.22
 
 </description>
 <parameters>
@@ -16792,7 +16716,6 @@
 </parameters>
 <return> an integer describing the type of control message
 
-Since: 2.22
 </return>
 </function>
 
@@ -16940,6 +16863,7 @@
 similar to g_object_new_valist() but also initializes the object
 and returns %NULL, setting an error on failure.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -16968,7 +16892,6 @@
 </parameters>
 <return> a newly allocated #GObject, or %NULL on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -16983,6 +16906,7 @@
 useful if you're listening on multiple addresses and do
 different things depending on what address is connected to.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -17005,7 +16929,6 @@
 </parameters>
 <return> %TRUE on success, %FALSE on error.
 
-Since: 2.22
 </return>
 </function>
 
@@ -17029,6 +16952,7 @@
 <description>
 Finishes an async accept operation. See g_socket_listener_accept_socket_async()
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -17052,25 +16976,55 @@
 </parameters>
 <return> a #GSocket on success, %NULL on error.
 
-Since: 2.22
 </return>
 </function>
 
-<function name="g_app_info_get_all_for_type">
+<function name="provided">
 <description>
-Gets a list of all #GAppInfo&lt;!-- --&gt;s for a given content type.
+connection is made to the service the #GSocketService:incoming
+signal is emitted.
+
+A #GSocketService is a subclass of #GSocketListener and you need
+to add the addresses you want to accept connections on to the
+with the #GSocketListener APIs.
+
+There are two options for implementing a network service based on
+#GSocketService. The first is to create the service using
+g_socket_service_new() and to connect to the #GSocketService:incoming
+signal. The second is to subclass #GSocketService and override the
+default signal handler implementation.
+
+In either case, the handler must immediately return, or else it
+will block additional incoming connections from being serviced.
+If you are interested in writing connection handlers that contain
+blocking code then see #GThreadedSocketService.
 
+The socket service runs on the main loop in the main thread, and is
+not threadsafe in general. However, the calls to start and stop
+the service are threadsafe so these can be used from threads that
+handle incoming clients.
+
+Since: 2.22
 
 </description>
 <parameters>
-<parameter name="content_type">
-<parameter_description> the content type to find a #GAppInfo for
-</parameter_description>
-</parameter>
 </parameters>
-<return> #GList of #GAppInfo&lt;!-- --&gt;s for given @content_type
-or %NULL on error.
-</return>
+<return></return>
+</function>
+
+<function name="for">
+<description>
+It is currently empty; it offers no additional functionality
+over its base class.
+
+Eventually, some TCP-specific socket stuff will be added.
+
+Since: 2.22
+
+</description>
+<parameters>
+</parameters>
+<return></return>
 </function>
 
 <function name="g_file_read_async">
@@ -17202,6 +17156,7 @@
 @bytes should be 4 bytes for %G_INET_ADDRESS_IPV4 and 16 bytes for
 %G_INET_ADDRESS_IPV6.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -17216,7 +17171,6 @@
 </parameters>
 <return> a new #GInetAddress corresponding to @family and @bytes.
 
-Since: 2.22
 </return>
 </function>
 
@@ -17225,33 +17179,18 @@
 Gets a #GList of strings containing the unix mount points. 
 If @time_read is set, it will be filled with the mount timestamp,
 allowing for checking if the mounts have changed with 
-g_unix_mounts_points_changed_since().
-
-
-</description>
-<parameters>
-<parameter name="time_read">
-<parameter_description> guint64 to contain a timestamp.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a #GList of the UNIX mountpoints. 
-</return>
-</function>
+g_unix_mounts_points_changed_since().
 
-<function name="g_file_attribute_info_list_unref">
-<description>
-Removes a reference from the given @list. If the reference count
-falls to zero, the @list is deleted.
 
 </description>
 <parameters>
-<parameter name="list">
-<parameter_description> The #GFileAttributeInfoList to unreference.
+<parameter name="time_read">
+<parameter_description> guint64 to contain a timestamp.
 </parameter_description>
 </parameter>
 </parameters>
-<return></return>
+<return> a #GList of the UNIX mountpoints. 
+</return>
 </function>
 
 <function name="g_socket_listener_accept_socket_async">
@@ -17297,6 +17236,7 @@
 This is an synchronous operation and as such may block doing IO;
 see g_mount_guess_content_type() for the asynchronous version.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -17322,7 +17262,6 @@
 <return> a %NULL-terminated array of content types or %NULL on error.
 Caller should free this array with g_strfreev() when done with it.
 
-Since: 2.18
 </return>
 </function>
 
@@ -17331,6 +17270,7 @@
 Finishes asynchronous initialization and returns the result.
 See g_async_initable_init_async().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -17351,7 +17291,6 @@
 <return> %TRUE if successful. If an error has occurred, this function
 will return %FALSE and set @error appropriately if present.
 
-Since: 2.22
 </return>
 </function>
 
@@ -17426,6 +17365,7 @@
 %G_IO_ERROR_NOT_SUPPORTED if the mount does not support content 
 guessing.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -17446,7 +17386,6 @@
 <return> a %NULL-terminated array of content types or %NULL on error. 
 Caller should free this array with g_strfreev() when done with it.
 
-Since: 2.18
 </return>
 </function>
 
@@ -17552,6 +17491,7 @@
 <description>
 Tests whether @address is the &quot;any&quot; address for its family.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -17562,7 +17502,6 @@
 </parameters>
 <return> %TRUE if @address is the &quot;any&quot; address for its family.
 
-Since: 2.22
 </return>
 </function>
 
@@ -17575,6 +17514,7 @@
 g_unix_socket_address_get_path_len() to get the true length
 of this string.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -17585,7 +17525,6 @@
 </parameters>
 <return> the path for @address
 
-Since: 2.22
 </return>
 </function>
 
@@ -17610,23 +17549,6 @@
 <return></return>
 </function>
 
-<function name="g_io_extension_ref_class">
-<description>
-Gets a reference to the class for the type that is 
-associated with @extension.
-
-
-</description>
-<parameters>
-<parameter name="extension">
-<parameter_description> a #GIOExtension
-</parameter_description>
-</parameter>
-</parameters>
-<return> the #GTypeClass for the type of @extension
-</return>
-</function>
-
 <function name="g_app_info_get_default_for_type">
 <description>
 Gets the #GAppInfo that corresponds to a given content type.
@@ -17823,6 +17745,22 @@
 </return>
 </function>
 
+<function name="of">
+<description>
+socket, either sync or async.
+
+If you want to implement a network server, also look at #GSocketService
+and #GThreadedSocketService which are subclass of #GSocketListener
+that makes this even easier.
+
+Since: 2.22
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_simple_async_result_run_in_thread">
 <description>
 Runs the asynchronous job in a separate thread and then calls
@@ -18008,6 +17946,15 @@
 </return>
 </function>
 
+<function name="or">
+<description>
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</function>
+
 <function name="g_file_monitor_file">
 <description>
 Obtains a file monitor for the given file. If no file notification
@@ -18042,23 +17989,6 @@
 </return>
 </function>
 
-<function name="g_file_attribute_matcher_enumerate_next">
-<description>
-Gets the next matched attribute from a #GFileAttributeMatcher.
-
-
-</description>
-<parameters>
-<parameter name="matcher">
-<parameter_description> a #GFileAttributeMatcher.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a string containing the next attribute or %NULL if 
-no more attribute exist.
-</return>
-</function>
-
 <function name="g_file_output_stream_get_etag">
 <description>
 Gets the entity tag for the file when it has been written.
@@ -18125,7 +18055,6 @@
 
 <function name="g_file_move">
 <description>
-
 Tries to move the file or directory @source to the location specified by @destination.
 If native move operations are supported then this is used, otherwise a copy + delete
 fallback is used. The native implementation may support moving directories (for instance
@@ -18202,6 +18131,7 @@
 <description>
 Try to get the local address of a socket connection.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18217,7 +18147,6 @@
 <return> a #GSocketAddress or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -18225,6 +18154,7 @@
 <description>
 Tests whether @address is a link-local multicast address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18235,7 +18165,6 @@
 </parameters>
 <return> %TRUE if @address is a link-local multicast address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -18278,6 +18207,7 @@
 You should not need to use this; normally #GSrvTarget&lt;!-- --&gt;s are
 created by #GResolver.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18300,7 +18230,6 @@
 </parameters>
 <return> a new #GSrvTarget.
 
-Since: 2.22
 </return>
 </function>
 
@@ -18504,6 +18433,7 @@
 
 On error -1 is returned and @error is set accordingly.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18548,7 +18478,6 @@
 </parameters>
 <return> Number of bytes read, or -1 on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -18556,6 +18485,7 @@
 <description>
 Copies @target
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18566,7 +18496,6 @@
 </parameters>
 <return> a copy of @target
 
-Since: 2.22
 </return>
 </function>
 
@@ -18574,6 +18503,7 @@
 <description>
 Tests whether @address is a site-local multicast address.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18584,7 +18514,6 @@
 </parameters>
 <return> %TRUE if @address is a site-local multicast address.
 
-Since: 2.22
 </return>
 </function>
 
@@ -18614,6 +18543,7 @@
 Finishes an asynchronous file replace operation started with
 g_file_replace_readwrite_async().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18633,7 +18563,6 @@
 <return> a #GFileIOStream, or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -18731,6 +18660,7 @@
 Finishes an asynchronous eject operation started by
 g_file_eject_mountable_with_operation().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18750,7 +18680,6 @@
 <return> %TRUE if the @file was ejected successfully. %FALSE
 otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -18822,6 +18751,7 @@
 
 On error -1 is returned and @error is set accordingly.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -18866,7 +18796,6 @@
 <return> Number of bytes written (which may be less than @size), or -1
 on error
 
-Since: 2.22
 </return>
 </function>
 
@@ -19011,30 +18940,6 @@
 <return></return>
 </function>
 
-<function name="g_file_enumerator_next_file">
-<description>
-Return value: A #GFileInfo or %NULL on error or end of enumerator.
-
-</description>
-<parameters>
-<parameter name="enumerator">
-<parameter_description> a #GFileEnumerator.
-</parameter_description>
-</parameter>
-<parameter name="cancellable">
-<parameter_description> optional #GCancellable object, %NULL to ignore.
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> location to store the error occuring, or %NULL to ignore
-</parameter_description>
-</parameter>
-</parameters>
-<return> A #GFileInfo or %NULL on error or end of enumerator.
-Free the returned object with g_object_unref() when no longer needed.
-</return>
-</function>
-
 <function name="g_simple_async_result_new_from_error">
 <description>
 Creates a #GSimpleAsyncResult from an error condition.
@@ -19063,23 +18968,24 @@
 </return>
 </function>
 
-<function name="GThemedIcon">
+<function name="g_unix_mount_is_readonly">
 <description>
-Whether to use the default fallbacks found by shortening the icon name 
-at '-' characters. If the &quot;names&quot; array has more than one element, 
-ignores any past the first.
+Checks if a unix mount is mounted read only.
 
-For example, if the icon name was &quot;gnome-dev-cdrom-audio&quot;, the array 
-would become
-|[
-{
-&quot;gnome-dev-cdrom-audio&quot;,
-&quot;gnome-dev-cdrom&quot;,
-&quot;gnome-dev&quot;,
-&quot;gnome&quot;,
-NULL
-};
-]|
+
+</description>
+<parameters>
+<parameter name="mount_entry">
+<parameter_description> a #GUnixMount.
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if @mount_entry is read only.
+</return>
+</function>
+
+<function name="sockaddr_in">
+<description>
 
 </description>
 <parameters>
@@ -19100,6 +19006,7 @@
 
 This function is useful in the implementation of g_mount_guess_content_type().
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -19111,7 +19018,6 @@
 <return> an %NULL-terminated array of zero or more content types, or %NULL. 
 Free with g_strfreev()
 
-Since: 2.18
 </return>
 </function>
 
@@ -19122,6 +19028,7 @@
 Finish an asynchronous start operation that was started
 with g_file_start_mountable().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -19141,7 +19048,6 @@
 <return> %TRUE if the operation finished successfully. %FALSE
 otherwise.
 
-Since: 2.22
 </return>
 </function>
 
@@ -19374,16 +19280,6 @@
 </return>
 </function>
 
-<function name="GZlibCompressor">
-<description>
-Zlib decompression
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_buffered_input_stream_get_available">
 <description>
 Gets the size of the available data within the stream.
@@ -19400,33 +19296,6 @@
 </return>
 </function>
 
-<function name="g_drive_stop_finish">
-<description>
-Finishes stopping a drive.
-
-
-</description>
-<parameters>
-<parameter name="drive">
-<parameter_description> a #GDrive.
-</parameter_description>
-</parameter>
-<parameter name="result">
-<parameter_description> a #GAsyncResult.
-</parameter_description>
-</parameter>
-<parameter name="error">
-<parameter_description> a #GError, or %NULL
-</parameter_description>
-</parameter>
-</parameters>
-<return> %TRUE if the drive has been stopped successfully,
-%FALSE otherwise.
-
-Since: 2.22
-</return>
-</function>
-
 <function name="missing_remove">
 <description>
 Unsafe, need lock fen_lock.
@@ -19437,50 +19306,6 @@
 <return></return>
 </function>
 
-<function name="g_resolver_lookup_service_async">
-<description>
-Begins asynchronously performing a DNS SRV lookup for the given
-@service and @protocol in the given @domain, and eventually calls
-@callback, which must call g_resolver_lookup_service_finish() to
-get the final result. See g_resolver_lookup_service() for more
-details.
-
-Since: 2.22
-
-</description>
-<parameters>
-<parameter name="resolver">
-<parameter_description> a #GResolver
-</parameter_description>
-</parameter>
-<parameter name="service">
-<parameter_description> the service type to look up (eg, &quot;ldap&quot;)
-</parameter_description>
-</parameter>
-<parameter name="protocol">
-<parameter_description> the networking protocol to use for @service (eg, &quot;tcp&quot;)
-</parameter_description>
-</parameter>
-<parameter name="domain">
-<parameter_description> the DNS domain to look up the service in
-</parameter_description>
-</parameter>
-<parameter name="cancellable">
-<parameter_description> a #GCancellable, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="callback">
-<parameter_description> callback to call after resolution completes
-</parameter_description>
-</parameter>
-<parameter name="user_data">
-<parameter_description> data for @callback
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_memory_output_stream_new">
 <description>
 Creates a new #GMemoryOutputStream.
@@ -19589,6 +19414,7 @@
 Finishes ejecting a volume. If any errors occured during the operation,
 @error will be set to contain the errors and %FALSE will be returned.
 
+Deprecated: 2.22: Use g_volume_eject_with_operation_finish() instead.
 
 </description>
 <parameters>
@@ -19607,7 +19433,6 @@
 </parameters>
 <return> %TRUE, %FALSE if operation failed.
 
-Deprecated: 2.22: Use g_volume_eject_with_operation_finish() instead.
 </return>
 </function>
 
@@ -19732,6 +19557,7 @@
 The primary use case of this method is to check if a file is a regular file,
 directory, or symlink.
 
+Since: 2.18
 
 </description>
 <parameters>
@@ -19751,7 +19577,6 @@
 <return> The #GFileType of the file and #G_FILE_TYPE_UNKNOWN if the file
 does not exist
 
-Since: 2.18
 </return>
 </function>
 
@@ -19760,6 +19585,7 @@
 Finishes unmounting a mount. If any errors occurred during the operation, 
 @error will be set to contain the errors and %FALSE will be returned.
 
+Deprecated: 2.22: Use g_mount_unmount_with_operation_finish() instead.
 
 </description>
 <parameters>
@@ -19779,7 +19605,6 @@
 </parameters>
 <return> %TRUE if the mount was successfully unmounted. %FALSE otherwise.
 
-Deprecated: 2.22: Use g_mount_unmount_with_operation_finish() instead.
 </return>
 </function>
 
@@ -19902,7 +19727,11 @@
 
 <function name="g_memory_output_stream_get_data_size">
 <description>
-Returns: the number of bytes written to the stream
+Returns the number of bytes from the start up
+to including the last byte written in the stream
+that has not been truncated away.
+
+Since: 2.18
 
 </description>
 <parameters>
@@ -19913,7 +19742,6 @@
 </parameters>
 <return> the number of bytes written to the stream
 
-Since: 2.18
 </return>
 </function>
 
@@ -19933,20 +19761,11 @@
 </return>
 </function>
 
-<function name="GFilenameCompleter">
-<description>
-Emitted when the file name completion information comes available.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
 <function name="g_inet_socket_address_get_port">
 <description>
 Gets @address's port.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -19957,7 +19776,6 @@
 </parameters>
 <return> the port for @address
 
-Since: 2.22
 </return>
 </function>
 
@@ -19995,6 +19813,7 @@
 parent at all.  If @parent is non-%NULL then %TRUE is only returned
 if @file is a child of @parent.
 
+Since: 2.24
 
 </description>
 <parameters>
@@ -20010,7 +19829,6 @@
 <return> %TRUE if @file is a child of @parent (or any parent in the
 case that @parent is %NULL).
 
-Since: 2.24
 </return>
 </function>
 
@@ -20053,6 +19871,7 @@
 <description>
 Try to get the remote address of a socket connection.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -20068,7 +19887,6 @@
 <return> a #GSocketAddress or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -20173,6 +19991,7 @@
 or return %G_IO_ERROR_WOULD_BLOCK if non-blocking I/O is enabled.
 To be notified of an incoming connection, wait for the %G_IO_IN condition.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -20192,7 +20011,6 @@
 <return> a new #GSocket, or %NULL on error.
 Free the returned object with g_object_unref().
 
-Since: 2.22
 </return>
 </function>
 
@@ -20244,6 +20062,7 @@
 Finish an asynchronous unmount operation that was started 
 with g_file_unmount_mountable().
 
+Deprecated: 2.22: Use g_file_unmount_mountable_with_operation_finish() instead.
 
 </description>
 <parameters>
@@ -20263,7 +20082,6 @@
 <return> %TRUE if the operation finished successfully. %FALSE
 otherwise.
 
-Deprecated: 2.22: Use g_file_unmount_mountable_with_operation_finish() instead.
 </return>
 </function>
 
@@ -20275,6 +20093,7 @@
 asynchronous operations on @file in a thread that has a
 thread-default context.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -20285,7 +20104,6 @@
 </parameters>
 <return> Whether or not @file supports thread-default contexts.
 
-Since: 2.22
 </return>
 </function>
 
@@ -20295,6 +20113,7 @@
 You can use this to allocate memory to pass to
 g_socket_address_to_native().
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -20306,7 +20125,6 @@
 <return> the size of the native &lt;type&gt;struct sockaddr&lt;/type&gt; that
 @address represents
 
-Since: 2.22
 </return>
 </function>
 
@@ -20452,6 +20270,7 @@
 The default implementation of this method just calls close on the
 individual input/output streams.
 
+Since: 2.22
 
 </description>
 <parameters>
@@ -20470,7 +20289,6 @@
 </parameters>
 <return> %TRUE on success, %FALSE on failure
 
-Since: 2.22
 </return>
 </function>
 
@@ -20479,13 +20297,13 @@
 Creates a new #GUnixFDMessage containing an empty file descriptor
 list.
 
+Since: 2.22
 
 </description>
 <parameters>
 </parameters>
 <return> a new #GUnixFDMessage
 
-Since: 2.22
 </return>
 </function>
 
