diff options
| -rw-r--r-- | doc/reference/Makefile.am | 15 | ||||
| -rw-r--r-- | doc/reference/json-glib-docs.xml | 2 | ||||
| -rw-r--r-- | doc/reference/json-glib-sections.txt | 33 |
3 files changed, 36 insertions, 14 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index d4df2e1..6e7e33c 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -45,14 +45,13 @@ CFILE_GLOB = $(top_srcdir)/json-glib/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES = \ - json-scanner.h \ - json-types-private.h \ - json-private.h \ - json-marshal.h \ - json-glib.h \ - json-enum-types.h \ - stamp-json-enum-types.h \ - stamp-json-marshal.h + json-scanner.h \ + json-types-private.h \ + json-gobject-private.h \ + json-private.h \ + json-marshal.h \ + json-glib.h \ + json-enum-types.h EXTRA_HFILES = diff --git a/doc/reference/json-glib-docs.xml b/doc/reference/json-glib-docs.xml index 3549aa0..f945a16 100644 --- a/doc/reference/json-glib-docs.xml +++ b/doc/reference/json-glib-docs.xml @@ -115,6 +115,8 @@ <title>JSON-GLib Advanced API</title> <xi:include href="xml/json-gobject.xml"/> + <xi:include href="xml/json-serializable.xml"/> + <xi:include href="xml/json-gboxed.xml"/> </part> <part id="json-tools"> diff --git a/doc/reference/json-glib-sections.txt b/doc/reference/json-glib-sections.txt index 2fa0058..428767d 100644 --- a/doc/reference/json-glib-sections.txt +++ b/doc/reference/json-glib-sections.txt @@ -193,16 +193,12 @@ json_generator_get_type </SECTION> <SECTION> -<FILE>json-gobject</FILE> -<TITLE>GObject integration</TITLE> +<FILE>json-serializable</FILE> +<TITLE>Serializable Interface</TITLE> JsonSerializableIface json_serializable_serialize_property json_serializable_deserialize_property -<SUBSECTION> -json_serialize_gobject -json_construct_gobject - <SUBSECTION Standard> JSON_TYPE_SERIALIZABLE JSON_SERIALIZABLE @@ -215,6 +211,31 @@ json_serializable_get_type </SECTION> <SECTION> +<FILE>json-gboxed</FILE> +<TITLE>Boxed Types Serialization</TITLE> +JsonBoxedSerializeFunc +JsonBoxedDeserializeFunc +json_boxed_register_transform_func + +<SUBSECTION> +json_boxed_can_serialize +json_boxed_can_deserialize +json_boxed_serialize +json_boxed_deserialize +</SECTION> + +<SECTION> +<FILE>json-gobject</FILE> +<TITLE>GObject Serialization</TITLE> +json_gobject_new +json_gobject_dump + +<SUBSECTION> +json_construct_gobject +json_serialize_gobject +</SECTION> + +<SECTION> <FILE>json-version</FILE> <TITLE>Versioning information</TITLE> JSON_MAJOR_VERSION |