Commit 249299a7 authored by Philip Withnall's avatar Philip Withnall

Merge branch 'doc-fixes' into 'master'

Various doc fixes

See merge request !982
parents fa4423d4 61872d60
Pipeline #96300 passed with stages
in 23 minutes and 23 seconds
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Copyright (C) 2018 Collabora Inc.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General
# Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
#
# Author: Xavier Claessens <xavier.claessens@collabora.com>
import sys
if len(sys.argv) < 3:
print('Usage: {} <output file> <input file 1> ...'.format(os.path.basename(sys.argv[0])))
sys.exit(1)
with open(sys.argv[1], 'w') as outfile:
for fname in sys.argv[2:]:
with open(fname) as infile:
for line in infile:
outfile.write(line)
<chapter id='unix-support'>
<!--FIXME: fill this with unix APIs that cannot build on Windows -->
</chapter>
<chapter id='win32-support'>
<title>Win32 support</title>
<xi:include href="xml/gwin32registrykey.xml"/>
<xi:include href="xml/gwin32inputstream.xml"/>
<xi:include href="xml/gwin32outputstream.xml"/>
</chapter>
......@@ -72,8 +72,6 @@
<xi:include href="xml/gdataoutputstream.xml"/>
<xi:include href="xml/gunixinputstream.xml"/>
<xi:include href="xml/gunixoutputstream.xml"/>
<xi:include href="xml/gwin32inputstream.xml"/>
<xi:include href="xml/gwin32outputstream.xml"/>
<xi:include href="xml/gconverterinputstream.xml"/>
<xi:include href="xml/gconverteroutputstream.xml"/>
<xi:include href="xml/gpollableinputstream.xml"/>
......@@ -124,6 +122,7 @@
<xi:include href="xml/gsocketaddress.xml"/>
<xi:include href="xml/ginetsocketaddress.xml"/>
<xi:include href="xml/gunixsocketaddress.xml"/>
<xi:include href="xml/gnativesocketaddress.xml"/>
<xi:include href="xml/gsocketcontrolmessage.xml"/>
<xi:include href="xml/gunixfdlist.xml"/>
<xi:include href="xml/gunixfdmessage.xml"/>
......@@ -219,10 +218,7 @@
<xi:include href="xml/glistmodel.xml"/>
<xi:include href="xml/gliststore.xml"/>
</chapter>
<chapter id='registry'>
<title>Win32 registry support</title>
<xi:include href="xml/gwin32registrykey.xml"/>
</chapter>
<chapter id="application">
<title>Application support</title>
<xi:include href="xml/gapplication.xml"/>
......@@ -264,6 +260,7 @@
<title>GIO Testing</title>
<xi:include href="xml/gtestdbus.xml"/>
</chapter>
<xi:include href="gio-docs-platform.xml"/>
</part>
<part id="migrating">
......
......@@ -719,27 +719,6 @@ g_unix_input_stream_get_type
GUnixInputStreamPrivate
</SECTION>
<SECTION>
<FILE>gwin32inputstream</FILE>
<TITLE>GWin32InputStream</TITLE>
GWin32InputStream
g_win32_input_stream_new
g_win32_input_stream_set_close_handle
g_win32_input_stream_get_close_handle
g_win32_input_stream_get_handle
<SUBSECTION Standard>
GWin32InputStreamClass
G_WIN32_INPUT_STREAM
G_IS_WIN32_INPUT_STREAM
G_TYPE_WIN32_INPUT_STREAM
G_WIN32_INPUT_STREAM_CLASS
G_IS_WIN32_INPUT_STREAM_CLASS
G_WIN32_INPUT_STREAM_GET_CLASS
<SUBSECTION Private>
g_win32_input_stream_get_type
GWin32InputStreamPrivate
</SECTION>
<SECTION>
<FILE>gmemoryinputstream</FILE>
<TITLE>GMemoryInputStream</TITLE>
......@@ -1024,27 +1003,6 @@ g_unix_output_stream_get_type
GUnixOutputStreamPrivate
</SECTION>
<SECTION>
<FILE>gwin32outputstream</FILE>
<TITLE>GWin32OutputStream</TITLE>
GWin32OutputStream
g_win32_output_stream_new
g_win32_output_stream_set_close_handle
g_win32_output_stream_get_close_handle
g_win32_output_stream_get_handle
<SUBSECTION Standard>
GWin32OutputStreamClass
G_WIN32_OUTPUT_STREAM
G_IS_WIN32_OUTPUT_STREAM
G_TYPE_WIN32_OUTPUT_STREAM
G_WIN32_OUTPUT_STREAM_CLASS
G_IS_WIN32_OUTPUT_STREAM_CLASS
G_WIN32_OUTPUT_STREAM_GET_CLASS
<SUBSECTION Private>
g_win32_output_stream_get_type
GWin32OutputStreamPrivate
</SECTION>
<SECTION>
<FILE>giostream</FILE>
<TITLE>GIOStream</TITLE>
......@@ -1959,6 +1917,7 @@ G_RESOLVER_GET_CLASS
G_TYPE_RESOLVER
G_TYPE_RESOLVER_ERROR
G_TYPE_RESOLVER_RECORD_TYPE
G_TYPE_RESOLVER_NAME_LOOKUP_FLAGS
<SUBSECTION Private>
GResolverPrivate
......@@ -1966,6 +1925,7 @@ g_resolver_get_type
g_resolver_error_quark
g_resolver_record_type_get_type
g_resolver_error_get_type
g_resolver_name_lookup_flags_get_type
</SECTION>
<SECTION>
......@@ -3679,6 +3639,10 @@ g_pollable_source_new_full
g_pollable_stream_read
g_pollable_stream_write
g_pollable_stream_write_all
<SUBSECTION Standard>
G_TYPE_POLLABLE_RETURN
<SUBSECTION Private>
g_pollable_return_get_type
</SECTION>
<SECTION>
......@@ -4693,74 +4657,3 @@ G_TYPE_LIST_STORE
<SUBSECTION Private>
g_list_store_get_type
</SECTION>
<SECTION>
<FILE>gwin32registrykey</FILE>
<SUBSECTION>
GWin32RegistrySubkeyIter
g_win32_registry_subkey_iter_copy
g_win32_registry_subkey_iter_free
g_win32_registry_subkey_iter_assign
<SUBSECTION>
GWin32RegistryValueIter
g_win32_registry_value_iter_copy
g_win32_registry_value_iter_free
g_win32_registry_value_iter_assign
<SUBSECTION>
GWin32RegistryKey
g_win32_registry_key_new
g_win32_registry_key_new_w
g_win32_registry_key_get_child
g_win32_registry_key_get_child_w
<SUBSECTION>
g_win32_registry_subkey_iter_init
g_win32_registry_subkey_iter_clear
g_win32_registry_subkey_iter_n_subkeys
g_win32_registry_subkey_iter_next
g_win32_registry_subkey_iter_get_name
g_win32_registry_subkey_iter_get_name_w
<SUBSECTION>
g_win32_registry_value_iter_init
g_win32_registry_value_iter_clear
g_win32_registry_value_iter_n_values
g_win32_registry_value_iter_next
GWin32RegistryValueType
g_win32_registry_value_iter_get_value_type
g_win32_registry_value_iter_get_name
g_win32_registry_value_iter_get_name_w
g_win32_registry_value_iter_get_data
g_win32_registry_value_iter_get_data_w
<SUBSECTION>
g_win32_registry_key_get_value
g_win32_registry_key_get_value_w
g_win32_registry_key_get_path
g_win32_registry_key_get_path_w
GWin32RegistryKeyWatchCallbackFunc
GWin32RegistryKeyWatcherFlags
g_win32_registry_key_watch
g_win32_registry_key_has_changed
g_win32_registry_key_erase_change_indicator
<SUBSECTION Standard>
GWin32RegistryKeyClass
<SUBSECTION Private>
GWin32RegistryKeyPrivate
g_win32_registry_key_get_type
g_win32_registry_subkey_iter_get_type
g_win32_registry_value_iter_get_type
G_TYPE_WIN32_REGISTRY_KEY
G_WIN32_REGISTRY_KEY
G_WIN32_REGISTRY_KEY_CLASS
G_IS_WIN32_REGISTRY_KEY
G_IS_WIN32_REGISTRY_KEY_CLASS
G_WIN32_REGISTRY_KEY_GET_CLASS
G_TYPE_WIN32_REGISTRY_SUBKEY_ITER
G_TYPE_WIN32_REGISTRY_VALUE_ITER
</SECTION>
<SECTION>
<FILE>gwin32inputstream</FILE>
<TITLE>GWin32InputStream</TITLE>
GWin32InputStream
g_win32_input_stream_new
g_win32_input_stream_set_close_handle
g_win32_input_stream_get_close_handle
g_win32_input_stream_get_handle
<SUBSECTION Standard>
GWin32InputStreamClass
G_WIN32_INPUT_STREAM
G_IS_WIN32_INPUT_STREAM
G_TYPE_WIN32_INPUT_STREAM
G_WIN32_INPUT_STREAM_CLASS
G_IS_WIN32_INPUT_STREAM_CLASS
G_WIN32_INPUT_STREAM_GET_CLASS
<SUBSECTION Private>
g_win32_input_stream_get_type
GWin32InputStreamPrivate
</SECTION>
<SECTION>
<FILE>gwin32outputstream</FILE>
<TITLE>GWin32OutputStream</TITLE>
GWin32OutputStream
g_win32_output_stream_new
g_win32_output_stream_set_close_handle
g_win32_output_stream_get_close_handle
g_win32_output_stream_get_handle
<SUBSECTION Standard>
GWin32OutputStreamClass
G_WIN32_OUTPUT_STREAM
G_IS_WIN32_OUTPUT_STREAM
G_TYPE_WIN32_OUTPUT_STREAM
G_WIN32_OUTPUT_STREAM_CLASS
G_IS_WIN32_OUTPUT_STREAM_CLASS
G_WIN32_OUTPUT_STREAM_GET_CLASS
<SUBSECTION Private>
g_win32_output_stream_get_type
GWin32OutputStreamPrivate
</SECTION>
<SECTION>
<FILE>gwin32registrykey</FILE>
<SUBSECTION>
GWin32RegistrySubkeyIter
g_win32_registry_subkey_iter_copy
g_win32_registry_subkey_iter_free
g_win32_registry_subkey_iter_assign
<SUBSECTION>
GWin32RegistryValueIter
g_win32_registry_value_iter_copy
g_win32_registry_value_iter_free
g_win32_registry_value_iter_assign
<SUBSECTION>
GWin32RegistryKey
g_win32_registry_key_new
g_win32_registry_key_new_w
g_win32_registry_key_get_child
g_win32_registry_key_get_child_w
<SUBSECTION>
g_win32_registry_subkey_iter_init
g_win32_registry_subkey_iter_clear
g_win32_registry_subkey_iter_n_subkeys
g_win32_registry_subkey_iter_next
g_win32_registry_subkey_iter_get_name
g_win32_registry_subkey_iter_get_name_w
<SUBSECTION>
g_win32_registry_value_iter_init
g_win32_registry_value_iter_clear
g_win32_registry_value_iter_n_values
g_win32_registry_value_iter_next
GWin32RegistryValueType
g_win32_registry_value_iter_get_value_type
g_win32_registry_value_iter_get_name
g_win32_registry_value_iter_get_name_w
g_win32_registry_value_iter_get_data
g_win32_registry_value_iter_get_data_w
<SUBSECTION>
g_win32_registry_key_get_value
g_win32_registry_key_get_value_w
g_win32_registry_key_get_path
g_win32_registry_key_get_path_w
GWin32RegistryKeyWatchCallbackFunc
GWin32RegistryKeyWatcherFlags
g_win32_registry_key_watch
g_win32_registry_key_has_changed
g_win32_registry_key_erase_change_indicator
<SUBSECTION Standard>
GWin32RegistryKeyClass
<SUBSECTION Private>
GWin32RegistryKeyPrivate
g_win32_registry_key_get_type
g_win32_registry_subkey_iter_get_type
g_win32_registry_value_iter_get_type
G_TYPE_WIN32_REGISTRY_KEY
G_WIN32_REGISTRY_KEY
G_WIN32_REGISTRY_KEY_CLASS
G_IS_WIN32_REGISTRY_KEY
G_IS_WIN32_REGISTRY_KEY_CLASS
G_WIN32_REGISTRY_KEY_GET_CLASS
G_TYPE_WIN32_REGISTRY_SUBKEY_ITER
G_TYPE_WIN32_REGISTRY_VALUE_ITER
</SECTION>
......@@ -81,15 +81,17 @@ if get_option('gtk_doc')
'gunixresolver.h',
'gunixvolume.h',
'gunixvolumemonitor.h',
'gwin32networkmonitor.h',
'gwin32appinfo.h',
'gwin32mount.h',
'gwin32registrykey.h',
'gwin32resolver.h',
'gwin32volumemonitor.h',
'thumbnail-verify.h',
'xdp-dbus.h',
]
sections_files = files('gio-sections-common.txt')
if host_system == 'windows'
ignore_headers += [
'gfiledescriptorbased.h',
......@@ -104,6 +106,8 @@ if get_option('gtk_doc')
'gdesktopappinfo.h',
'gosxappinfo.h',
]
sections_files += files('gio-sections-win32.txt')
platform_file = files('gio-docs-win32.xml')
else
if glib_have_cocoa
ignore_headers += ['gdesktopappinfo.h']
......@@ -112,10 +116,11 @@ if get_option('gtk_doc')
endif
ignore_headers += [
'gwin32networkmonitor.h',
'gwin32inputstream.h',
'gwin32outputstream.h',
'gwin32registrykey.h',
]
platform_file = files('gio-docs-unix.xml')
endif
ignore_sources = [
......@@ -125,8 +130,6 @@ if get_option('gtk_doc')
'xdp-dbus.c',
]
# FIXME: More win32 headers were added to fix building gio-scan
# FIXME: ExampleAnimal docs aren't built
docpath = join_paths(glib_datadir, 'gtk-doc', 'html')
......@@ -138,6 +141,19 @@ if get_option('gtk_doc')
configuration: version_conf
)
concat_files_helper = find_program('concat-files-helper.py')
configure_file(
output : 'gio-sections.txt',
input : sections_files,
command : [concat_files_helper, '@OUTPUT@', '@INPUT@'],
)
configure_file(
output : 'gio-docs-platform.xml',
input : platform_file,
copy : true,
)
gnome.gtkdoc('gio',
main_xml : 'gio-docs.xml',
namespace : 'g',
......
......@@ -141,6 +141,25 @@ GLIB_DISABLE_DEPRECATION_WARNINGS
<SUBSECTION Private>
G_ENCODE_VERSION
GLIB_AVAILABLE_ENUMERATOR_IN_2_26
GLIB_AVAILABLE_ENUMERATOR_IN_2_28
GLIB_AVAILABLE_ENUMERATOR_IN_2_30
GLIB_AVAILABLE_ENUMERATOR_IN_2_32
GLIB_AVAILABLE_ENUMERATOR_IN_2_34
GLIB_AVAILABLE_ENUMERATOR_IN_2_36
GLIB_AVAILABLE_ENUMERATOR_IN_2_38
GLIB_AVAILABLE_ENUMERATOR_IN_2_40
GLIB_AVAILABLE_ENUMERATOR_IN_2_42
GLIB_AVAILABLE_ENUMERATOR_IN_2_44
GLIB_AVAILABLE_ENUMERATOR_IN_2_46
GLIB_AVAILABLE_ENUMERATOR_IN_2_48
GLIB_AVAILABLE_ENUMERATOR_IN_2_50
GLIB_AVAILABLE_ENUMERATOR_IN_2_52
GLIB_AVAILABLE_ENUMERATOR_IN_2_54
GLIB_AVAILABLE_ENUMERATOR_IN_2_56
GLIB_AVAILABLE_ENUMERATOR_IN_2_58
GLIB_AVAILABLE_ENUMERATOR_IN_2_60
GLIB_AVAILABLE_ENUMERATOR_IN_2_62
GLIB_AVAILABLE_IN_ALL
GLIB_AVAILABLE_IN_2_26
GLIB_AVAILABLE_IN_2_28
......@@ -161,6 +180,84 @@ GLIB_AVAILABLE_IN_2_56
GLIB_AVAILABLE_IN_2_58
GLIB_AVAILABLE_IN_2_60
GLIB_AVAILABLE_IN_2_62
GLIB_AVAILABLE_MACRO_IN_2_26
GLIB_AVAILABLE_MACRO_IN_2_28
GLIB_AVAILABLE_MACRO_IN_2_30
GLIB_AVAILABLE_MACRO_IN_2_32
GLIB_AVAILABLE_MACRO_IN_2_34
GLIB_AVAILABLE_MACRO_IN_2_36
GLIB_AVAILABLE_MACRO_IN_2_38
GLIB_AVAILABLE_MACRO_IN_2_40
GLIB_AVAILABLE_MACRO_IN_2_42
GLIB_AVAILABLE_MACRO_IN_2_44
GLIB_AVAILABLE_MACRO_IN_2_46
GLIB_AVAILABLE_MACRO_IN_2_48
GLIB_AVAILABLE_MACRO_IN_2_50
GLIB_AVAILABLE_MACRO_IN_2_52
GLIB_AVAILABLE_MACRO_IN_2_54
GLIB_AVAILABLE_MACRO_IN_2_56
GLIB_AVAILABLE_MACRO_IN_2_58
GLIB_AVAILABLE_MACRO_IN_2_60
GLIB_AVAILABLE_MACRO_IN_2_62
GLIB_AVAILABLE_TYPE_IN_2_26
GLIB_AVAILABLE_TYPE_IN_2_28
GLIB_AVAILABLE_TYPE_IN_2_30
GLIB_AVAILABLE_TYPE_IN_2_32
GLIB_AVAILABLE_TYPE_IN_2_34
GLIB_AVAILABLE_TYPE_IN_2_36
GLIB_AVAILABLE_TYPE_IN_2_38
GLIB_AVAILABLE_TYPE_IN_2_40
GLIB_AVAILABLE_TYPE_IN_2_42
GLIB_AVAILABLE_TYPE_IN_2_44
GLIB_AVAILABLE_TYPE_IN_2_46
GLIB_AVAILABLE_TYPE_IN_2_48
GLIB_AVAILABLE_TYPE_IN_2_50
GLIB_AVAILABLE_TYPE_IN_2_52
GLIB_AVAILABLE_TYPE_IN_2_54
GLIB_AVAILABLE_TYPE_IN_2_56
GLIB_AVAILABLE_TYPE_IN_2_58
GLIB_AVAILABLE_TYPE_IN_2_60
GLIB_AVAILABLE_TYPE_IN_2_62
GLIB_DEPRECATED_ENUMERATOR
GLIB_DEPRECATED_ENUMERATOR_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_26
GLIB_DEPRECATED_ENUMERATOR_IN_2_26_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_28
GLIB_DEPRECATED_ENUMERATOR_IN_2_28_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_30
GLIB_DEPRECATED_ENUMERATOR_IN_2_30_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_32
GLIB_DEPRECATED_ENUMERATOR_IN_2_32_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_34
GLIB_DEPRECATED_ENUMERATOR_IN_2_34_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_36
GLIB_DEPRECATED_ENUMERATOR_IN_2_36_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_38
GLIB_DEPRECATED_ENUMERATOR_IN_2_38_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_40
GLIB_DEPRECATED_ENUMERATOR_IN_2_40_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_42
GLIB_DEPRECATED_ENUMERATOR_IN_2_42_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_44
GLIB_DEPRECATED_ENUMERATOR_IN_2_44_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_46
GLIB_DEPRECATED_ENUMERATOR_IN_2_46_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_48
GLIB_DEPRECATED_ENUMERATOR_IN_2_48_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_50
GLIB_DEPRECATED_ENUMERATOR_IN_2_50_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_52
GLIB_DEPRECATED_ENUMERATOR_IN_2_52_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_54
GLIB_DEPRECATED_ENUMERATOR_IN_2_54_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_56
GLIB_DEPRECATED_ENUMERATOR_IN_2_56_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_58
GLIB_DEPRECATED_ENUMERATOR_IN_2_58_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_60
GLIB_DEPRECATED_ENUMERATOR_IN_2_60_FOR
GLIB_DEPRECATED_ENUMERATOR_IN_2_62
GLIB_DEPRECATED_ENUMERATOR_IN_2_62_FOR
GLIB_DEPRECATED_IN_2_26
GLIB_DEPRECATED_IN_2_26_FOR
GLIB_DEPRECATED_IN_2_28
......@@ -199,6 +296,86 @@ GLIB_DEPRECATED_IN_2_60
GLIB_DEPRECATED_IN_2_60_FOR
GLIB_DEPRECATED_IN_2_62
GLIB_DEPRECATED_IN_2_62_FOR
GLIB_DEPRECATED_MACRO
GLIB_DEPRECATED_MACRO_FOR
GLIB_DEPRECATED_MACRO_IN_2_26
GLIB_DEPRECATED_MACRO_IN_2_26_FOR
GLIB_DEPRECATED_MACRO_IN_2_28
GLIB_DEPRECATED_MACRO_IN_2_28_FOR
GLIB_DEPRECATED_MACRO_IN_2_30
GLIB_DEPRECATED_MACRO_IN_2_30_FOR
GLIB_DEPRECATED_MACRO_IN_2_32
GLIB_DEPRECATED_MACRO_IN_2_32_FOR
GLIB_DEPRECATED_MACRO_IN_2_34
GLIB_DEPRECATED_MACRO_IN_2_34_FOR
GLIB_DEPRECATED_MACRO_IN_2_36
GLIB_DEPRECATED_MACRO_IN_2_36_FOR
GLIB_DEPRECATED_MACRO_IN_2_38
GLIB_DEPRECATED_MACRO_IN_2_38_FOR
GLIB_DEPRECATED_MACRO_IN_2_40
GLIB_DEPRECATED_MACRO_IN_2_40_FOR
GLIB_DEPRECATED_MACRO_IN_2_42
GLIB_DEPRECATED_MACRO_IN_2_42_FOR
GLIB_DEPRECATED_MACRO_IN_2_44
GLIB_DEPRECATED_MACRO_IN_2_44_FOR
GLIB_DEPRECATED_MACRO_IN_2_46
GLIB_DEPRECATED_MACRO_IN_2_46_FOR
GLIB_DEPRECATED_MACRO_IN_2_48
GLIB_DEPRECATED_MACRO_IN_2_48_FOR
GLIB_DEPRECATED_MACRO_IN_2_50
GLIB_DEPRECATED_MACRO_IN_2_50_FOR
GLIB_DEPRECATED_MACRO_IN_2_52
GLIB_DEPRECATED_MACRO_IN_2_52_FOR
GLIB_DEPRECATED_MACRO_IN_2_54
GLIB_DEPRECATED_MACRO_IN_2_54_FOR
GLIB_DEPRECATED_MACRO_IN_2_56
GLIB_DEPRECATED_MACRO_IN_2_56_FOR
GLIB_DEPRECATED_MACRO_IN_2_58
GLIB_DEPRECATED_MACRO_IN_2_58_FOR
GLIB_DEPRECATED_MACRO_IN_2_60
GLIB_DEPRECATED_MACRO_IN_2_60_FOR
GLIB_DEPRECATED_MACRO_IN_2_62
GLIB_DEPRECATED_MACRO_IN_2_62_FOR
GLIB_DEPRECATED_TYPE
GLIB_DEPRECATED_TYPE_FOR
GLIB_DEPRECATED_TYPE_IN_2_26
GLIB_DEPRECATED_TYPE_IN_2_26_FOR
GLIB_DEPRECATED_TYPE_IN_2_28
GLIB_DEPRECATED_TYPE_IN_2_28_FOR
GLIB_DEPRECATED_TYPE_IN_2_30
GLIB_DEPRECATED_TYPE_IN_2_30_FOR
GLIB_DEPRECATED_TYPE_IN_2_32
GLIB_DEPRECATED_TYPE_IN_2_32_FOR
GLIB_DEPRECATED_TYPE_IN_2_34
GLIB_DEPRECATED_TYPE_IN_2_34_FOR
GLIB_DEPRECATED_TYPE_IN_2_36
GLIB_DEPRECATED_TYPE_IN_2_36_FOR
GLIB_DEPRECATED_TYPE_IN_2_38
GLIB_DEPRECATED_TYPE_IN_2_38_FOR
GLIB_DEPRECATED_TYPE_IN_2_40
GLIB_DEPRECATED_TYPE_IN_2_40_FOR
GLIB_DEPRECATED_TYPE_IN_2_42
GLIB_DEPRECATED_TYPE_IN_2_42_FOR
GLIB_DEPRECATED_TYPE_IN_2_44
GLIB_DEPRECATED_TYPE_IN_2_44_FOR
GLIB_DEPRECATED_TYPE_IN_2_46
GLIB_DEPRECATED_TYPE_IN_2_46_FOR
GLIB_DEPRECATED_TYPE_IN_2_48
GLIB_DEPRECATED_TYPE_IN_2_48_FOR
GLIB_DEPRECATED_TYPE_IN_2_50
GLIB_DEPRECATED_TYPE_IN_2_50_FOR
GLIB_DEPRECATED_TYPE_IN_2_52
GLIB_DEPRECATED_TYPE_IN_2_52_FOR
GLIB_DEPRECATED_TYPE_IN_2_54
GLIB_DEPRECATED_TYPE_IN_2_54_FOR
GLIB_DEPRECATED_TYPE_IN_2_56
GLIB_DEPRECATED_TYPE_IN_2_56_FOR
GLIB_DEPRECATED_TYPE_IN_2_58
GLIB_DEPRECATED_TYPE_IN_2_58_FOR
GLIB_DEPRECATED_TYPE_IN_2_60
GLIB_DEPRECATED_TYPE_IN_2_60_FOR
GLIB_DEPRECATED_TYPE_IN_2_62
GLIB_DEPRECATED_TYPE_IN_2_62_FOR
GLIB_VERSION_CUR_STABLE
GLIB_VERSION_PREV_STABLE
</SECTION>
......@@ -500,6 +677,9 @@ G_VA_COPY_AS_ARRAY
GLIB_DEPRECATED
GLIB_DEPRECATED_FOR
GLIB_UNAVAILABLE
GLIB_UNAVAILABLE_ENUMERATOR
GLIB_UNAVAILABLE_MACRO
GLIB_UNAVAILABLE_TYPE
G_ANALYZER_ANALYZING
G_ANALYZER_NORETURN
g_autoptr_cleanup_generic_gfree
......
......@@ -38,6 +38,7 @@ if get_option('gtk_doc')
'valgrind.h',
'gutilsprivate.h',
'gvalgrind.h',
'dirent.h',
]
docpath = join_paths(glib_datadir, 'gtk-doc', 'html')
......
......@@ -196,6 +196,10 @@
<title>Index of new symbols in 2.56</title>
<xi:include href="xml/api-index-2.56.xml"><xi:fallback /></xi:include>
</index>
<index id="api-index-2-62" role="2.62">
<title>Index of new symbols in 2.62</title>
<xi:include href="xml/api-index-2.62.xml"><xi:fallback /></xi:include>
</index>
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
......
......@@ -97,6 +97,7 @@ void g_async_initable_new_async (GType object_type,
...);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_async_initable_init_async)
void g_async_initable_newv_async (GType object_type,
guint n_parameters,
......@@ -105,6 +106,7 @@ void g_async_initable_newv_async (GType object_type,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
G_GNUC_END_IGNORE_DEPRECATIONS
GLIB_AVAILABLE_IN_ALL
......
......@@ -70,10 +70,12 @@ GLIB_AVAILABLE_IN_ALL
GList * g_content_types_get_registered (void);
/*< private >*/
#ifndef __GTK_DOC_IGNORE__
GLIB_AVAILABLE_IN_2_60
const gchar * const *g_content_type_get_mime_dirs (void);
GLIB_AVAILABLE_IN_2_60
void g_content_type_set_mime_dirs (const gchar * const *dirs);
#endif /* __GTK_DOC_IGNORE__ */
G_END_DECLS
......
......@@ -82,12 +82,14 @@ gpointer g_initable_new (GType object_type,
...);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_initable_init)
gpointer g_initable_newv (GType object_type,
guint n_parameters,
GParameter *parameters,
GCancellable *cancellable,
GError **error);
G_GNUC_END_IGNORE_DEPRECATIONS
GLIB_AVAILABLE_IN_ALL
......
......@@ -224,7 +224,7 @@ g_network_address_get_property (GObject *object,
}
/**
/*
* inet_addresses_to_inet_socket_addresses:
* @addresses: (transfer full): #GList of #GInetAddress
*
......
......@@ -155,7 +155,7 @@
* G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_release)
* ]|
*
* Since: 2.58.
* Since: 2.58
*/
/**
......
......@@ -159,7 +159,7 @@
* G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_release)
* ]|
*
* Since: 2.58.
* Since: 2.58
*/
/* We use the same alignment as GTypeInstance and GNU libc's malloc */
......
......@@ -367,9 +367,11 @@ typedef enum {
} GTestTrapFlags GLIB_DEPRECATED_TYPE_IN_2_38_FOR(GTestSubprocessFlags);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GLIB_DEPRECATED_IN_2_38_FOR (g_test_trap_subprocess)
gboolean g_test_trap_fork (guint64 usec_timeout,
GTestTrapFlags test_trap_flags);
G_GNUC_END_IGNORE_DEPRECATIONS
typedef enum {
......
......@@ -451,6 +451,9 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
_GLIB_CHECKED_MUL_U32(dest, a, b)
#endif
/* FIXME: Hide this from gtkdoc scanner because it confuses its poor regexes.
* https://gitlab.gnome.org/GNOME/gtk-doc/issues/90 */
#ifndef __GTK_DOC_IGNORE__
/* The names of the following inlines are private. Use the macro
* definitions above.
*/
......@@ -474,6 +477,7 @@ static inline gboolean _GLIB_CHECKED_ADD_U64 (guint64 *dest, guint64 a, guint64
static inline gboolean _GLIB_CHECKED_MUL_U64 (guint64 *dest, guint64 a, guint64 b) {
*dest = a * b; return !a || *dest / a == b; }
#endif
#endif /* __GTK_DOC_IGNORE__ */
/* IEEE Standard 754 Single Precision Storage Format (gfloat):
*
......
......@@ -420,6 +420,10 @@ typedef enum
* @G_UNICODE_SCRIPT_MEDEFAIDRIN: Medefaidrin. Since: 2.58
* @G_UNICODE_SCRIPT_OLD_SOGDIAN: Old Sogdian. Since: 2.58
* @G_UNICODE_SCRIPT_SOGDIAN: Sogdian. Since: 2.58
* @G_UNICODE_SCRIPT_ELYMAIC: Elym. Since: 2.62
* @G_UNICODE_SCRIPT_NANDINAGARI: Nand. Since: 2.62
* @G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG: Rohg. Since: 2.62
* @G_UNICODE_SCRIPT_WANCHO: Wcho. Since: 2.62
*
* The #GUnicodeScript enumeration identifies different writing