Imported Upstream version 1.2.8 15/168615/1 upstream/1.2.8
authorDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 30 Jan 2018 01:20:48 +0000 (10:20 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 30 Jan 2018 01:20:52 +0000 (10:20 +0900)
Change-Id: I85cf954169bc65a2a968271f14a40acdcb5f1d0f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
219 files changed:
ChangeLog
Makefile.am
Makefile.in
aclocal.m4
build/Makefile.in
build/autotools/Makefile.in
build/win32/Makefile.in
build/win32/config.h.win32
build/win32/vs10/Makefile.in
build/win32/vs10/json-glib-gen-srcs.props
build/win32/vs10/json-glib-version-paths.props
build/win32/vs10/json-glib.vcxproj
build/win32/vs10/json-glib.vcxprojin
build/win32/vs11/Makefile.in
build/win32/vs11/json-glib-gen-srcs.props
build/win32/vs11/json-glib-version-paths.props
build/win32/vs11/json-glib.vcxproj
build/win32/vs12/Makefile.in
build/win32/vs12/json-glib-gen-srcs.props
build/win32/vs12/json-glib-version-paths.props
build/win32/vs12/json-glib.vcxproj
build/win32/vs14/Makefile.in
build/win32/vs14/json-glib-gen-srcs.props
build/win32/vs14/json-glib-version-paths.props
build/win32/vs14/json-glib.vcxproj
build/win32/vs15/Makefile.in
build/win32/vs15/json-glib-gen-srcs.props
build/win32/vs15/json-glib-version-paths.props
build/win32/vs15/json-glib.vcxproj
build/win32/vs9/Makefile.in
build/win32/vs9/json-glib-gen-srcs.vsprops
build/win32/vs9/json-glib-version-paths.vsprops
build/win32/vs9/json-glib.vcproj
build/win32/vs9/json-glib.vcprojin
configure
configure.ac
doc/Makefile.am
doc/Makefile.in
doc/html/JsonBuilder.html [moved from doc/reference/html/JsonBuilder.html with 89% similarity]
doc/html/JsonGenerator.html [moved from doc/reference/html/JsonGenerator.html with 79% similarity]
doc/html/JsonParser.html [moved from doc/reference/html/JsonParser.html with 77% similarity]
doc/html/JsonPath.html [moved from doc/reference/html/JsonPath.html with 90% similarity]
doc/html/JsonReader.html [moved from doc/reference/html/JsonReader.html with 85% similarity]
doc/html/annotation-glossary.html [moved from doc/reference/html/annotation-glossary.html with 98% similarity]
doc/html/ch01.html [moved from doc/reference/html/ch01.html with 95% similarity]
doc/html/ch02.html [moved from doc/reference/html/ch02.html with 94% similarity]
doc/html/ch03.html [moved from doc/reference/html/ch03.html with 94% similarity]
doc/html/ch04.html [moved from doc/reference/html/ch04.html with 94% similarity]
doc/html/ch06.html [moved from doc/reference/html/ch06.html with 86% similarity]
doc/html/home.png [moved from doc/reference/html/home.png with 100% similarity]
doc/html/index.html [moved from doc/reference/html/index.html with 88% similarity]
doc/html/ix01.html [moved from doc/reference/html/ix01.html with 99% similarity]
doc/html/ix02.html [moved from doc/reference/html/ix02.html with 96% similarity]
doc/html/ix03.html [moved from doc/reference/html/ix03.html with 96% similarity]
doc/html/ix04.html [moved from doc/reference/html/ix04.html with 96% similarity]
doc/html/ix05.html [moved from doc/reference/html/ix05.html with 99% similarity]
doc/html/ix06.html [moved from doc/reference/html/ix06.html with 98% similarity]
doc/html/ix07.html [moved from doc/reference/html/ix07.html with 98% similarity]
doc/html/ix08.html [moved from doc/reference/html/ix08.html with 98% similarity]
doc/html/ix09.html [moved from doc/reference/html/ix09.html with 97% similarity]
doc/html/ix10.html [moved from doc/reference/html/ix10.html with 95% similarity]
doc/html/ix11.html [moved from doc/reference/html/ix11.html with 98% similarity]
doc/html/json-advanced.html [moved from doc/reference/html/json-advanced.html with 96% similarity]
doc/html/json-base.html [moved from doc/reference/html/json-base.html with 88% similarity]
doc/html/json-format-tool.html [moved from doc/reference/html/json-format-tool.html with 97% similarity]
doc/html/json-glib-Boxed-Types-Serialization.html [moved from doc/reference/html/json-glib-Boxed-Types-Serialization.html with 73% similarity]
doc/html/json-glib-GObject-Serialization.html [moved from doc/reference/html/json-glib-GObject-Serialization.html with 61% similarity]
doc/html/json-glib-JSON-Array.html [moved from doc/reference/html/json-glib-JSON-Array.html with 88% similarity]
doc/html/json-glib-JSON-GVariant-Integration.html [moved from doc/reference/html/json-glib-JSON-GVariant-Integration.html with 64% similarity]
doc/html/json-glib-JSON-Node.html [moved from doc/reference/html/json-glib-JSON-Node.html with 88% similarity]
doc/html/json-glib-JSON-Object.html [moved from doc/reference/html/json-glib-JSON-Object.html with 86% similarity]
doc/html/json-glib-Serializable-Interface.html [moved from doc/reference/html/json-glib-Serializable-Interface.html with 77% similarity]
doc/html/json-glib-Utility-API.html [moved from doc/reference/html/json-glib-Utility-API.html with 84% similarity]
doc/html/json-glib-Versioning-information.html [moved from doc/reference/html/json-glib-Versioning-information.html with 93% similarity]
doc/html/json-glib.devhelp2 [moved from doc/reference/html/json-glib.devhelp2 with 99% similarity]
doc/html/json-overview.html [moved from doc/reference/html/json-glib.html with 80% similarity]
doc/html/json-streams.html [moved from doc/reference/html/json-streams.html with 96% similarity]
doc/html/json-tools.html [moved from doc/reference/html/json-tools.html with 95% similarity]
doc/html/json-validate-tool.html [moved from doc/reference/html/json-validate-tool.html with 96% similarity]
doc/html/left-insensitive.png [moved from doc/reference/html/left-insensitive.png with 100% similarity]
doc/html/left.png [moved from doc/reference/html/left.png with 100% similarity]
doc/html/license.html [moved from doc/reference/html/license.html with 96% similarity]
doc/html/right-insensitive.png [moved from doc/reference/html/right-insensitive.png with 100% similarity]
doc/html/right.png [moved from doc/reference/html/right.png with 100% similarity]
doc/html/style.css [moved from doc/reference/html/style.css with 100% similarity]
doc/html/tools.html [moved from doc/reference/html/tools.html with 94% similarity]
doc/html/up-insensitive.png [moved from doc/reference/html/up-insensitive.png with 100% similarity]
doc/html/up.png [moved from doc/reference/html/up.png with 100% similarity]
doc/json-glib-docs.xml [moved from doc/reference/json-glib-docs.xml with 87% similarity]
doc/json-glib-format.1 [moved from doc/reference/json-glib-format.1 with 98% similarity]
doc/json-glib-format.xml [moved from doc/reference/json-glib-format.xml with 100% similarity]
doc/json-glib-overrides.txt [new file with mode: 0644]
doc/json-glib-sections.txt [moved from doc/reference/json-glib-sections.txt with 99% similarity]
doc/json-glib-validate.1 [moved from doc/reference/json-glib-validate.1 with 98% similarity]
doc/json-glib-validate.xml [moved from doc/reference/json-glib-validate.xml with 100% similarity]
doc/json-glib.types [moved from doc/reference/json-glib.types with 100% similarity]
doc/meson.build [moved from doc/reference/meson.build with 99% similarity]
doc/reference/Makefile.am [deleted file]
doc/reference/Makefile.in [deleted file]
doc/reference/json-glib-overrides.txt [deleted file]
doc/reference/version.xml [deleted file]
doc/reference/version.xml.in [deleted file]
doc/xml/gtkdocentities.ent.in [moved from doc/reference/xml/gtkdocentities.ent.in with 100% similarity]
doc/xml/meson.build [moved from doc/reference/xml/meson.build with 100% similarity]
gtk-doc.make
json-glib/Json-1.0.gir
json-glib/Makefile.in
json-glib/config.h.in [moved from config.h.in with 96% similarity]
json-glib/json-glib.pc.in
json-glib/json-path.c
json-glib/json-version.h
json-glib/meson.build
json-glib/tests/Makefile.in
meson.build
po/as.gmo
po/as.po
po/bg.gmo
po/bg.po
po/bn_IN.gmo
po/bn_IN.po
po/bs.gmo
po/bs.po
po/ca.gmo
po/ca.po
po/ca@valencia.gmo
po/ca@valencia.po
po/cs.gmo
po/cs.po
po/da.gmo
po/da.po
po/de.gmo
po/de.po
po/el.gmo
po/el.po
po/en_GB.gmo
po/en_GB.po
po/eo.gmo
po/eo.po
po/es.gmo
po/es.po
po/et.gmo
po/et.po
po/eu.gmo
po/eu.po
po/fr.gmo
po/fr.po
po/fur.gmo
po/fur.po
po/gl.gmo
po/gl.po
po/he.gmo
po/he.po
po/hi.gmo
po/hi.po
po/hu.gmo
po/hu.po
po/id.gmo
po/id.po
po/it.gmo
po/it.po
po/ja.gmo
po/ja.po
po/json-glib-1.0.pot
po/ko.gmo
po/ko.po
po/ky.gmo
po/ky.po
po/lt.gmo
po/lt.po
po/lv.gmo
po/lv.po
po/ml.gmo
po/ml.po
po/nb.gmo
po/nb.po
po/oc.gmo
po/oc.po
po/or.gmo
po/or.po
po/pa.gmo
po/pa.po
po/pl.gmo
po/pl.po
po/pt.gmo
po/pt.po
po/pt_BR.gmo
po/pt_BR.po
po/ro.gmo
po/ro.po
po/ru.gmo
po/ru.po
po/sk.gmo
po/sk.po
po/sl.gmo
po/sl.po
po/sr.gmo
po/sr.po
po/sr@latin.gmo
po/sr@latin.po
po/sv.gmo
po/sv.po
po/te.gmo
po/te.po
po/tg.gmo
po/tg.po
po/tr.gmo
po/tr.po
po/ug.gmo
po/ug.po
po/uk.gmo
po/uk.po
po/vi.gmo
po/vi.po
po/zh_CN.gmo
po/zh_CN.po
po/zh_HK.gmo
po/zh_HK.po
po/zh_TW.gmo
po/zh_TW.po

index c7513ea..b02c5de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,303 @@
+commit f97b6ca9c684bc7adf9b07043b62ecd7443272fc
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sat Mar 18 13:22:25 2017 +0000
+
+    Release JSON-GLib 1.2.8
+
+ configure.ac | 2 +-
+ meson.build  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit cef59a7c8ef4cc4d35e42cf0f3cbe7fd8217de62
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sat Mar 18 13:31:21 2017 +0000
+
+    Update the Git ignore file
+    
+    The `reference` path has been removed.
+
+ .gitignore | 41 ++++++++++++++++++++---------------------
+ 1 file changed, 20 insertions(+), 21 deletions(-)
+
+commit 503b813696284fec0980d5f6d464008c574e487d
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sat Mar 18 13:20:00 2017 +0000
+
+    doc: Update the README
+    
+    Replace the build instruction and dependencies to point at Meson instead
+    of autotools.
+
+ README.md | 33 ++++++++++++++++++++-------------
+ 1 file changed, 20 insertions(+), 13 deletions(-)
+
+commit 016c93db6da096271ba19daad6ad10bd439f33d9
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Mar 14 14:33:40 2017 +0000
+
+    build: Sync the interface age with the version
+    
+    Like we do in the Meson build, the Autotools build should reset the
+    interface age every time we do a development cycle.
+
+ configure.ac | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+commit d1d2a978786437b411ea4fe66173236073527ab7
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sat Mar 18 13:34:42 2017 +0000
+
+    doc: Use 'plain' language for JSON snippets
+
+ json-glib/json-path.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit ba663922b3d620b540c1d9436895e651190cb0b9
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Mar 14 11:15:39 2017 +0000
+
+    doc: Link the bug reporting URI in the API reference
+
+ doc/json-glib-docs.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit b66aa29fd0e06a2ade0621ba997dff989af4fc4c
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Mar 14 11:14:49 2017 +0000
+
+    Use the appropriate values to initialize Autotools
+    
+    The package name is "JSON-GLib"; the tarball name is "json-glib".
+    
+    The wiki page has also been moved.
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 66746cfa3de8cdb272c30da5c762735265e3b040
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Mar 14 10:58:33 2017 +0000
+
+    Move the reference build down one level
+    
+    There's no point in having the API reference in its own sub-directory:
+    it's the only documentation we have.
+
+ Makefile.am                                   |  6 +--
+ configure.ac                                  |  2 -
+ doc/Makefile.am                               | 78 ++++++++++++++++++++++++---
+ doc/{reference => }/json-glib-docs.xml        |  0
+ doc/{reference => }/json-glib-format.xml      |  0
+ doc/{reference => }/json-glib-overrides.txt   |  0
+ doc/{reference => }/json-glib-sections.txt    |  0
+ doc/{reference => }/json-glib-validate.xml    |  0
+ doc/{reference => }/meson.build               |  0
+ doc/reference/Makefile.am                     | 78 ---------------------------
+ doc/reference/version.xml.in                  |  1 -
+ doc/{reference => }/xml/gtkdocentities.ent.in |  0
+ doc/{reference => }/xml/meson.build           |  0
+ meson.build                                   |  2 +-
+ 14 files changed, 75 insertions(+), 92 deletions(-)
+
+commit 1447d8b527864c10899dab3733068407b82fb19b
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Mar 14 10:48:55 2017 +0000
+
+    build: Fix soversion for Meson builds
+    
+    During stable cycles we want the interface age to match the micro
+    version, as there are no symbol additions if the minor version is
+    an even number.
+    
+    Conversely, we want the interface age to reset to 0, as there are
+    no expectations of ABI compatibility for newly added symbols.
+    
+    The current check uses the micro version, instead of the odd version,
+    which breaks the logic above.
+    
+    This ensures that the soname generated via the Meson build is the
+    same as the one generated by the Autotools one.
+
+ meson.build | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit 82438b38ec955057b314126b5a7d044b2675a34d
+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date:   Tue Mar 14 13:03:29 2017 +0800
+
+    Visual Studio builds: Copy config.h.win32 to $(srcroot)\json-glib
+    
+    This follows the autotools builds and Meson builds.
+
+ build/win32/vs10/json-glib-gen-srcs.props  | 2 +-
+ build/win32/vs10/json-glib.vcxprojin       | 4 ++--
+ build/win32/vs9/json-glib-gen-srcs.vsprops | 2 +-
+ build/win32/vs9/json-glib.vcprojin         | 8 ++++----
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+commit d0eee742ccdcf67bd72f7506069346dbf0556b9c
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 18:15:44 2017 +0000
+
+    build: Generate the config.h file under json-glib
+    
+    Ensure that autotools and Meson behave similarly.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a1e2f314de3d37b8c543e7402d55d3ab93097abe
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 18:12:38 2017 +0000
+
+    build: Ignore 'config.h' when building the API reference
+    
+    It's an internal header.
+
+ doc/reference/Makefile.am | 1 +
+ doc/reference/meson.build | 2 ++
+ 2 files changed, 3 insertions(+)
+
+commit 0273e08ed61d2d83fb0308be05583e9a2741adb2
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 18:11:07 2017 +0000
+
+    docs: Override version macros
+    
+    We don't need to show what they evaluate to, given that the value
+    changes with every release.
+
+ .gitignore                            |  1 -
+ doc/reference/json-glib-overrides.txt | 14 ++++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+commit 68fe01530aefc8c87e04d1e2fc35a64dd8df20a5
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 18:07:11 2017 +0000
+
+    docs: Reference the JSON-GLib header
+    
+    The API reference should list the header that user code should include
+    in order to use the API.
+
+ doc/reference/json-glib-sections.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 7dad6e7473852b687e12e737874d532261dbc343
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 18:06:14 2017 +0000
+
+    docs: Add links to online resources
+    
+    Link the built API reference on developer.gnome.org, and the JSON
+    website.
+
+ doc/reference/json-glib-docs.xml | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+commit 690d98d870c7cbad68ec9f1143879ed35c0037a2
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 17:50:59 2017 +0000
+
+    build: Really require the same pkg-config modules
+
+ json-glib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 04a5298e6d9d862bed8567ac802f1aaa415f4ff4
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 17:47:59 2017 +0000
+
+    build: Require the same modules for Meson and Autotools
+    
+    We depend on gio-2.0, which strings along glib-2.0 and gobject-2.0.
+
+ json-glib/json-glib.pc.in | 2 +-
+ json-glib/meson.build     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f98d547d78ad294894cf8dfff5b0de1aa550bea7
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 17:02:21 2017 +0000
+
+    Fix the generated pkg-config file with Meson
+    
+    We need to specify the sub-directory for the inclusion directive.
+
+ json-glib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c1c04b0cfd3ebc8b4cf7299b6bf71a5149762330
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 16:21:40 2017 +0000
+
+    build: Add missing argument to the introspection scanner
+    
+    The autotools build specifies the include header with the --c-include
+    argument for g-ir-scanner, so we need to do the same when building with
+    Meson.
+
+ json-glib/meson.build | 26 ++++++++++++++++----------
+ 1 file changed, 16 insertions(+), 10 deletions(-)
+
+commit 4641cad9c3c9a26a1cb22d8517b971747b0271b6
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 15:33:52 2017 +0000
+
+    Ensure that introspection scans all the headers
+    
+    We have a couple of generated header files, which means we need to list
+    them as sources for the introspection scanner.
+
+ json-glib/meson.build | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit c623283f7177fd9d832de282aa38542642ce4082
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 15:16:33 2017 +0000
+
+    build: Reduce the internal dependencies
+    
+    We don't need to make internal targets depend on generated sources, just
+    on the generated header files. Depending on the generated sources will
+    cause Meson to compile the generated sources once for each internal
+    target.
+
+ json-glib/meson.build | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+commit 1119bac133cd60552f661d2e2a5b21d2a8c80130
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 15:08:40 2017 +0000
+
+    Add missing header in the Meson file listing
+    
+    The single include 'json-glib.h' header is missing.
+
+ json-glib/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 3e28eebd47125fea6c749d9434ba1c638af53441
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 15:03:19 2017 +0000
+
+    Remove dependency on json-version.h
+    
+    The file is generated at configuration time.
+
+ json-glib/meson.build | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+commit db79241262c49a541e3eb06398c5d1f0d55f504c
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Mar 13 14:55:03 2017 +0000
+
+    Post-release version bump to 1.2.7
+
+ configure.ac | 4 ++--
+ meson.build  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
 commit 886572be7eb888528b5012d0e7288ab904dac339
 Author: Emmanuele Bassi <ebassi@gnome.org>
 Date:   Mon Mar 13 14:27:17 2017 +0000
index d932b4f..328b384 100644 (file)
@@ -3,9 +3,9 @@ ACLOCAL_AMFLAGS = -I build/autotools
 EXTRA_DIST = \
        meson.build \
        meson_options.txt \
-       doc/reference/meson.build \
-       doc/reference/xml/meson.build \
-       doc/reference/xml/gtkdocentities.ent.in \
+       doc/meson.build \
+       doc/xml/meson.build \
+       doc/xml/gtkdocentities.ent.in \
        json-glib/meson.build \
        json-glib/tests/meson.build \
        json-glib/tests/gen-installed-test.py \
index d87fe99..d78f701 100644 (file)
@@ -118,7 +118,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -156,8 +156,7 @@ am__recursive_targets = \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
        cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-       $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -178,8 +177,8 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-       $(top_srcdir)/build/compile $(top_srcdir)/build/config.guess \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/build/compile \
+       $(top_srcdir)/build/config.guess \
        $(top_srcdir)/build/config.rpath \
        $(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \
        $(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing \
@@ -410,9 +409,9 @@ ACLOCAL_AMFLAGS = -I build/autotools
 EXTRA_DIST = \
        meson.build \
        meson_options.txt \
-       doc/reference/meson.build \
-       doc/reference/xml/meson.build \
-       doc/reference/xml/gtkdocentities.ent.in \
+       doc/meson.build \
+       doc/xml/meson.build \
+       doc/xml/gtkdocentities.ent.in \
        json-glib/meson.build \
        json-glib/tests/meson.build \
        json-glib/tests/gen-installed-test.py \
@@ -421,8 +420,7 @@ EXTRA_DIST = \
 
 SUBDIRS = json-glib doc build po
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --enable-maintainer-flags --enable-introspection
-all: config.h
-       $(MAKE) $(AM_MAKEFLAGS) all-recursive
+all: all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
@@ -459,21 +457,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
-config.h: stamp-h1
-       @test -f $@ || rm -f stamp-h1
-       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-       @rm -f stamp-h1
-       cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-       ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-       rm -f stamp-h1
-       touch $@
-
-distclean-hdr:
-       -rm -f config.h stamp-h1
-
 mostlyclean-libtool:
        -rm -f *.lo
 
@@ -781,7 +764,7 @@ distcleancheck: distclean
               exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -821,8 +804,8 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-       distclean-libtool distclean-tags
+distclean-am: clean-am distclean-generic distclean-libtool \
+       distclean-tags
 
 dvi: dvi-recursive
 
@@ -884,24 +867,24 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
        am--refresh check check-am clean clean-cscope clean-generic \
        clean-libtool cscope cscopelist-am ctags ctags-am dist \
        dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
        dist-tarZ dist-xz dist-zip distcheck distclean \
-       distclean-generic distclean-hdr distclean-libtool \
-       distclean-tags distcleancheck distdir distuninstallcheck dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs installdirs-am \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags tags-am uninstall uninstall-am
+       distclean-generic distclean-libtool distclean-tags \
+       distcleancheck distdir distuninstallcheck dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+       uninstall-am
 
 .PRECIOUS: Makefile
 
index 8f7f346..8cbaeef 100644 (file)
@@ -20,6 +20,218 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# Configure paths for GLIB
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
+dnl gthread, or gio is specified in MODULES, pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GLIB_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
+                   , enable_glibtest=yes)
+
+  pkg_config_args=glib-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject) 
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+         gio*) 
+             pkg_config_args="$pkg_config_args $module-2.0"
+         ;;
+      esac
+  done
+
+  PKG_PROG_PKG_CONFIG([0.16])
+
+  no_glib=""
+
+  if test "x$PKG_CONFIG" = x ; then
+    no_glib=yes
+    PKG_CONFIG=no
+  fi
+
+  min_glib_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+         echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+         enable_glibtest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+         :
+    else
+         no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  unsigned int major, minor, micro;
+
+  fclose (fopen ("conf.glibtest", "w"));
+
+  if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+          (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+            GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+            glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
+              major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+         echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     GLIB_COMPILE_RESOURCES=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  AC_SUBST(GLIB_GENMARSHAL)
+  AC_SUBST(GOBJECT_QUERY)
+  AC_SUBST(GLIB_MKENUMS)
+  AC_SUBST(GLIB_COMPILE_RESOURCES)
+  rm -f conf.glibtest
+])
+
 dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
 dnl serial 11 (pkg-config-0.29.1)
 dnl
@@ -296,218 +508,6 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-                   , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export) 
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-         gio*) 
-             pkg_config_args="$pkg_config_args $module-2.0"
-         ;;
-      esac
-  done
-
-  PKG_PROG_PKG_CONFIG([0.16])
-
-  no_glib=""
-
-  if test "x$PKG_CONFIG" = x ; then
-    no_glib=yes
-    PKG_CONFIG=no
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-         echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-         enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-         :
-    else
-         no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  unsigned int major, minor, micro;
-
-  fclose (fopen ("conf.glibtest", "w"));
-
-  if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-          (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-            GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-            glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
-              major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-         echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     GLIB_COMPILE_RESOURCES=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  AC_SUBST(GLIB_COMPILE_RESOURCES)
-  rm -f conf.glibtest
-])
-
 # Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
index bd729bf..b82de8c 100644 (file)
@@ -115,7 +115,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -174,7 +174,7 @@ ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \
-       config.rpath config.sub install-sh ltmain.sh missing
+       config.rpath config.sub depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
index e0e4217..46d3d3a 100644 (file)
@@ -115,7 +115,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index 88bd19b..ffaaa73 100644 (file)
@@ -115,7 +115,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES = config.h.win32
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index c155acd..3ce82f3 100644 (file)
@@ -78,7 +78,7 @@
 #define PACKAGE_NAME "json-glib"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "json-glib 1.2.6"
+#define PACKAGE_STRING "json-glib 1.2.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "json-glib"
@@ -87,7 +87,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.6"
+#define PACKAGE_VERSION "1.2.8"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
index a03ae5e..8b8e623 100644 (file)
@@ -115,7 +115,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES = json-glib-version-paths.props
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index f5629eb..4cdd31b 100644 (file)
@@ -4,7 +4,7 @@
     <Import Project="json-glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyConfigH>copy ..\config.h.win32 ..\..\..\json-glib\config.h</CopyConfigH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>jsonglibgensrcsprops</_PropertySheetDisplayName>
index ea3b38f..48f9858 100644 (file)
@@ -7,7 +7,7 @@
     <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <JsonGlibMajorVersion>1</JsonGlibMajorVersion>
     <JsonGlibMinorVersion>2</JsonGlibMinorVersion>
-    <JsonGlibMicroVersion>6</JsonGlibMicroVersion>
+    <JsonGlibMicroVersion>8</JsonGlibMicroVersion>
     <ApiVersion>1.0</ApiVersion>
     <JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
     <JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
index 07f7331..73ce486 100644 (file)
     <CustomBuild Include="..\config.h.win32">
       <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
index 92fb8c9..23f5f0d 100644 (file)
     <CustomBuild Include="..\config.h.win32">
       <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
index c682e13..082998b 100644 (file)
@@ -130,7 +130,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index f5629eb..4cdd31b 100644 (file)
@@ -4,7 +4,7 @@
     <Import Project="json-glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyConfigH>copy ..\config.h.win32 ..\..\..\json-glib\config.h</CopyConfigH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>jsonglibgensrcsprops</_PropertySheetDisplayName>
index 864b3cb..c04619e 100644 (file)
@@ -7,7 +7,7 @@
     <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <JsonGlibMajorVersion>1</JsonGlibMajorVersion>
     <JsonGlibMinorVersion>2</JsonGlibMinorVersion>
-    <JsonGlibMicroVersion>6</JsonGlibMicroVersion>
+    <JsonGlibMicroVersion>8</JsonGlibMicroVersion>
     <ApiVersion>1.0</ApiVersion>
     <JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
     <JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
index a7d363c..23a7b36 100644 (file)
     <CustomBuild Include="..\config.h.win32">
       <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
index 69c831c..d4d84ad 100644 (file)
@@ -130,7 +130,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index f5629eb..4cdd31b 100644 (file)
@@ -4,7 +4,7 @@
     <Import Project="json-glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyConfigH>copy ..\config.h.win32 ..\..\..\json-glib\config.h</CopyConfigH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>jsonglibgensrcsprops</_PropertySheetDisplayName>
index 4bad2ee..915d4f4 100644 (file)
@@ -7,7 +7,7 @@
     <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <JsonGlibMajorVersion>1</JsonGlibMajorVersion>
     <JsonGlibMinorVersion>2</JsonGlibMinorVersion>
-    <JsonGlibMicroVersion>6</JsonGlibMicroVersion>
+    <JsonGlibMicroVersion>8</JsonGlibMicroVersion>
     <ApiVersion>1.0</ApiVersion>
     <JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
     <JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
index 7a250d7..0bea46e 100644 (file)
     <CustomBuild Include="..\config.h.win32">
       <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
index 2321be7..e2f7ab4 100644 (file)
@@ -130,7 +130,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index f5629eb..4cdd31b 100644 (file)
@@ -4,7 +4,7 @@
     <Import Project="json-glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyConfigH>copy ..\config.h.win32 ..\..\..\json-glib\config.h</CopyConfigH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>jsonglibgensrcsprops</_PropertySheetDisplayName>
index d0f63cc..9b233c5 100644 (file)
@@ -7,7 +7,7 @@
     <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <JsonGlibMajorVersion>1</JsonGlibMajorVersion>
     <JsonGlibMinorVersion>2</JsonGlibMinorVersion>
-    <JsonGlibMicroVersion>6</JsonGlibMicroVersion>
+    <JsonGlibMicroVersion>8</JsonGlibMicroVersion>
     <ApiVersion>1.0</ApiVersion>
     <JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
     <JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
index 7b47556..84aa874 100644 (file)
     <CustomBuild Include="..\config.h.win32">
       <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
index 7ae0d54..3174db0 100644 (file)
@@ -130,7 +130,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index f5629eb..4cdd31b 100644 (file)
@@ -4,7 +4,7 @@
     <Import Project="json-glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyConfigH>copy ..\config.h.win32 ..\..\..\json-glib\config.h</CopyConfigH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>jsonglibgensrcsprops</_PropertySheetDisplayName>
index 6339ee8..1755644 100644 (file)
@@ -7,7 +7,7 @@
     <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <JsonGlibMajorVersion>1</JsonGlibMajorVersion>
     <JsonGlibMinorVersion>2</JsonGlibMinorVersion>
-    <JsonGlibMicroVersion>6</JsonGlibMicroVersion>
+    <JsonGlibMicroVersion>8</JsonGlibMicroVersion>
     <ApiVersion>1.0</ApiVersion>
     <JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
     <JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
index f9938a4..28640e9 100644 (file)
     <CustomBuild Include="..\config.h.win32">
       <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
index f2468f0..efb61de 100644 (file)
@@ -115,7 +115,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES = json-glib-version-paths.vsprops
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
index aa4fee6..977f685 100644 (file)
@@ -7,6 +7,6 @@
        >
        <UserMacro
                Name="CopyConfigH"
-               Value="copy ..\config.h.win32 ..\..\..\config.h"
+               Value="copy ..\config.h.win32 ..\..\..\json-glib\config.h"
        />
 </VisualStudioPropertySheet>
index bae7fa1..86ca7ae 100644 (file)
@@ -30,7 +30,7 @@
        />
        <UserMacro
                Name="JsonGlibMicroVersion"
-               Value="6"
+               Value="8"
        />
        <UserMacro
                Name="ApiVersion"
index 0f738e5..737b28d 100644 (file)
       Name="VCCustomBuildTool"
       Description="Copying config.h from config.h.win32..."
       CommandLine="$(CopyConfigH)"
-      Outputs="..\..\..\config.h"
+      Outputs="..\..\..\json-glib\config.h"
      />
     </FileConfiguration>
     <FileConfiguration Name="Release|Win32">
       Name="VCCustomBuildTool"
       Description="Copying config.h from config.h.win32..."
       CommandLine="$(CopyConfigH)"
-      Outputs="..\..\..\config.h"
+      Outputs="..\..\..\json-glib\config.h"
      />
     </FileConfiguration>
     <FileConfiguration Name="Debug|x64">
       Name="VCCustomBuildTool"
       Description="Copying config.h from config.h.win32..."
       CommandLine="$(CopyConfigH)"
-      Outputs="..\..\..\config.h"
+      Outputs="..\..\..\json-glib\config.h"
      />
     </FileConfiguration>
     <FileConfiguration Name="Release|x64">
       Name="VCCustomBuildTool"
       Description="Copying config.h from config.h.win32..."
       CommandLine="$(CopyConfigH)"
-      Outputs="..\..\..\config.h"
+      Outputs="..\..\..\json-glib\config.h"
      />
     </FileConfiguration>
    </File>
index 351bcb5..ce380cf 100644 (file)
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                        </File>
index 9409976..fcc7a90 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for json-glib 1.2.6.
+# Generated by GNU Autoconf 2.69 for JSON-GLib 1.2.8.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib>.
 #
@@ -589,12 +589,12 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='json-glib'
+PACKAGE_NAME='JSON-GLib'
 PACKAGE_TARNAME='json-glib'
-PACKAGE_VERSION='1.2.6'
-PACKAGE_STRING='json-glib 1.2.6'
+PACKAGE_VERSION='1.2.8'
+PACKAGE_STRING='JSON-GLib 1.2.8'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib'
-PACKAGE_URL='http://live.gnome.org/JsonGlib'
+PACKAGE_URL='http://wiki.gnome.org/Project/JsonGlib'
 
 ac_unique_file="json-glib/json-glib.h"
 # Factoring default headers for most tests.
@@ -1435,7 +1435,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures json-glib 1.2.6 to adapt to many kinds of systems.
+\`configure' configures JSON-GLib 1.2.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1505,7 +1505,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of json-glib 1.2.6:";;
+     short | recursive ) echo "Configuration of JSON-GLib 1.2.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1591,7 +1591,7 @@ Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib>.
-json-glib home page: <http://live.gnome.org/JsonGlib>.
+JSON-GLib home page: <http://wiki.gnome.org/Project/JsonGlib>.
 _ACEOF
 ac_status=$?
 fi
@@ -1654,7 +1654,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-json-glib configure 1.2.6
+JSON-GLib configure 1.2.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1932,7 +1932,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by json-glib $as_me 1.2.6, which was
+It was created by JSON-GLib $as_me 1.2.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2282,7 +2282,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers json-glib/config.h"
 
 
 ac_aux_dir=
@@ -2802,7 +2802,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='json-glib'
- VERSION='1.2.6'
+ VERSION='1.2.8'
 
 
 # Some tools Automake needs.
@@ -12515,8 +12515,8 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
 JSON_MAJOR_VERSION=1
 JSON_MINOR_VERSION=2
-JSON_MICRO_VERSION=6
-JSON_VERSION=1.2.6
+JSON_MICRO_VERSION=8
+JSON_VERSION=1.2.8
 JSON_RELEASE_STATUS=release
 
 
@@ -12525,7 +12525,7 @@ JSON_RELEASE_STATUS=release
 
 
 JSON_LT_CURRENT=200
-JSON_LT_REVISION=6
+JSON_LT_REVISION=8
 JSON_LT_AGE=200
 JSON_LT_VERSION="$JSON_LT_CURRENT:$JSON_LT_REVISION:$JSON_LT_AGE"
 JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION"
@@ -12899,9 +12899,9 @@ else
 fi
 
   if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-    installed_test_metadir=${datadir}/installed-tests/json-glib
+    installed_test_metadir=${datadir}/installed-tests/JSON-GLib
 
-    installed_testdir=${libexecdir}/installed-tests/json-glib
+    installed_testdir=${libexecdir}/installed-tests/JSON-GLib
 
   fi
 
@@ -13746,7 +13746,7 @@ fi
   test $ac_status = 0; }; then
   found_introspection=yes
 else
-  as_fn_error $? "You need to have gobject-introspection >= 0.9.5 installed to build json-glib" "$LINENO" 5
+  as_fn_error $? "You need to have gobject-introspection >= 0.9.5 installed to build JSON-GLib" "$LINENO" 5
 fi
      ;; #(
       auto) :
@@ -15883,7 +15883,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile build/win32/Makefile build/win32/config.h.win32 build/win32/vs9/Makefile build/win32/vs9/json-glib-version-paths.vsprops build/win32/vs10/Makefile build/win32/vs10/json-glib-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile build/win32/vs15/Makefile json-glib/Makefile json-glib/json-glib.pc json-glib/json-version.h json-glib/tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml po/Makefile.in"
+ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile build/win32/Makefile build/win32/config.h.win32 build/win32/vs9/Makefile build/win32/vs9/json-glib-version-paths.vsprops build/win32/vs10/Makefile build/win32/vs10/json-glib-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile build/win32/vs15/Makefile json-glib/Makefile json-glib/json-glib.pc json-glib/json-version.h json-glib/tests/Makefile doc/Makefile po/Makefile.in"
 
 
 cat >confcache <<\_ACEOF
@@ -16476,7 +16476,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by json-glib $as_me 1.2.6, which was
+This file was extended by JSON-GLib $as_me 1.2.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16537,13 +16537,13 @@ Configuration commands:
 $config_commands
 
 Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib>.
-json-glib home page: <http://live.gnome.org/JsonGlib>."
+JSON-GLib home page: <http://wiki.gnome.org/Project/JsonGlib>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-json-glib config.status 1.2.6
+JSON-GLib config.status 1.2.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16962,7 +16962,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "json-glib/config.h") CONFIG_HEADERS="$CONFIG_HEADERS json-glib/config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
@@ -16984,8 +16984,6 @@ do
     "json-glib/json-version.h") CONFIG_FILES="$CONFIG_FILES json-glib/json-version.h" ;;
     "json-glib/tests/Makefile") CONFIG_FILES="$CONFIG_FILES json-glib/tests/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "doc/reference/Makefile") CONFIG_FILES="$CONFIG_FILES doc/reference/Makefile" ;;
-    "doc/reference/version.xml") CONFIG_FILES="$CONFIG_FILES doc/reference/version.xml" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
index 9599908..34ff72d 100644 (file)
@@ -2,7 +2,7 @@
 # bump micro_version to the next odd number after each release
 m4_define([json_major_version], [1])
 m4_define([json_minor_version], [2])
-m4_define([json_micro_version], [6])
+m4_define([json_micro_version], [8])
 
 m4_define([json_version], [json_major_version.json_minor_version.json_micro_version])
 
@@ -11,11 +11,17 @@ m4_define([json_release_status],
                  [m4_if(m4_eval(json_minor_version % 2), [1], [snapshot],
                                                               [release])])])
 
-# bump up by 1 for every micro release with no API changes, otherwise
-# set to 0. after release, bump up by 1
-m4_define([json_interface_age], [6])
-m4_define([json_binary_age], [m4_eval(100 * json_minor_version + json_micro_version)])
+# Only development cycles are allowed to add API
+m4_define([json_interface_age],
+          [m4_if(m4_eval(json_minor_version % 2), [1],
+                 [0],
+                 [json_micro_version])])
 
+# Binary age increases with every release
+m4_define([json_binary_age],
+          [m4_eval(100 * json_minor_version + json_micro_version)])
+
+# Keep the soname compatible between micro releases of the same stable cycle
 m4_define([lt_current], [m4_eval(100 * json_minor_version + json_micro_version - json_interface_age)])
 m4_define([lt_revision], [json_interface_age])
 m4_define([lt_age], [m4_eval(json_binary_age - json_interface_age)])
@@ -24,13 +30,13 @@ m4_define([glib_req_version], [2.37.6])
 
 AC_PREREQ([2.63])
 
-AC_INIT([json-glib],
+AC_INIT([JSON-GLib],
         [json_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib],
         [json-glib],
-        [http://live.gnome.org/JsonGlib])
+        [http://wiki.gnome.org/Project/JsonGlib])
 
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([json-glib/config.h])
 AC_CONFIG_SRCDIR([json-glib/json-glib.h])
 AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build/autotools])
@@ -392,8 +398,6 @@ AC_CONFIG_FILES([
         json-glib/tests/Makefile
 
         doc/Makefile
-        doc/reference/Makefile
-        doc/reference/version.xml
 
         po/Makefile.in
 ])
index fd91f01..0a021ce 100644 (file)
@@ -1,11 +1,75 @@
-SUBDIRS = reference
+DOC_MODULE = json-glib
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
+DOC_SOURCE_DIR = $(top_srcdir)/json-glib $(top_builddir)/json-glib
 
-test-report:
-       @true
+SCANGOBJ_OPTIONS =
+SCAN_OPTIONS = --deprecated-guards="JSON_DISABLE_DEPRECATED" --rebuild-types
+MKDB_OPTIONS = --output-format=xml --name-space=json
+MKTMPL_OPTIONS =
+FIXXREF_OPTIONS = \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
 
-test:
-       @true
+HFILE_GLOB = $(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
+CFILE_GLOB = $(top_srcdir)/json-glib/*.c
 
-check-local: test
+IGNORE_HFILES = \
+       config.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       \
+       json-debug.h
 
-.PHONY: test-report test check-local
+EXTRA_HFILES =
+
+HTML_IMAGES =
+
+content_files = \
+       json-glib-format.xml \
+       json-glib-validate.xml
+
+expand_content_files =
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
+
+include $(top_srcdir)/gtk-doc.make
+
+man_MANS =
+
+if ENABLE_GTK_DOC
+TESTS_ENVIRONMENT = \
+       DOC_MODULE=$(DOC_MODULE) \
+       DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+       SRCDIR=$(abs_srcdir) \
+       BUILDDIR=$(abs_builddir)
+
+TESTS = $(GTKDOC_CHECK)
+endif
+
+if ENABLE_MAN
+man_MANS += \
+       json-glib-format.1 \
+       json-glib-validate.1
+
+XSLTPROC_FLAGS = \
+       --nonet \
+       --stringparam man.output.quietly 1 \
+       --stringparam funcsynopsis.style ansi \
+       --stringparam man.th.extra1.suppress 1 \
+       --stringparam man.authors.section.enabled 0 \
+       --stringparam man.copyright.section.enabled 0
+
+.xml.1:
+       $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+endif
+
+CLEANFILES ?=
+CLEANFILES += $(man_MANS)
+EXTRA_DIST += $(man_MANS)
index d842b36..d1fadee 100644 (file)
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -87,6 +93,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@ENABLE_MAN_TRUE@am__append_1 = \
+@ENABLE_MAN_TRUE@      json-glib-format.1 \
+@ENABLE_MAN_TRUE@      json-glib-validate.1
+
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -115,7 +125,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -132,74 +142,221 @@ am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-       ctags-recursive dvi-recursive html-recursive info-recursive \
-       install-data-recursive install-dvi-recursive \
-       install-exec-recursive install-html-recursive \
-       install-info-recursive install-pdf-recursive \
-       install-ps-recursive install-recursive installcheck-recursive \
-       installdirs-recursive pdf-recursive ps-recursive \
-       tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-       distdir
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)"
+NROFF = nroff
+MANS = $(man_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='\e[0;31m'; \
+    grn='\e[0;32m'; \
+    lgn='\e[1;32m'; \
+    blu='\e[1;34m'; \
+    mgn='\e[0;35m'; \
+    brg='\e[1m'; \
+    std='\e[m'; \
+  fi; \
+}
+am__recheck_rx = ^[    ]*:recheck:[    ]*
+am__global_test_result_rx = ^[         ]*:global-test-result:[         ]*
+am__copy_in_global_log_rx = ^[         ]*:copy-in-global-log:[         ]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+           recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[       ]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);                                     \
+$(am__vpath_adj_setup) $(am__vpath_adj)                        \
+$(am__tty_colors);                                     \
+srcdir=$(srcdir); export srcdir;                       \
+case "$@" in                                           \
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;   \
+    *) am__odir=.;;                                    \
+esac;                                                  \
+test "x$$am__odir" = x"." || test -d "$$am__odir"      \
+  || $(MKDIR_P) "$$am__odir" || exit $$?;              \
+if test -f "./$$f"; then dir=./;                       \
+elif test -f "$$f"; then dir=;                         \
+else dir="$(srcdir)/"; fi;                             \
+tst=$$dir$$f; log='$@';                                \
+if test -n '$(DISABLE_HARD_ERRORS)'; then              \
+  am__enable_hard_errors=no;                           \
+else                                                   \
+  am__enable_hard_errors=yes;                          \
+fi;                                                    \
+case " $(XFAIL_TESTS) " in                             \
+  *[\ \        ]$$f[\ \        ]* | *[\ \      ]$$dir$$f[\ \   ]*) \
+    am__expect_failure=yes;;                           \
+  *)                                                   \
+    am__expect_failure=no;;                            \
+esac;                                                  \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+       $(TEST_LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+       $(top_srcdir)/build/test-driver $(top_srcdir)/gtk-doc.make
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
@@ -380,11 +537,136 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = reference
-all: all-recursive
+DOC_MODULE = json-glib
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
+DOC_SOURCE_DIR = $(top_srcdir)/json-glib $(top_builddir)/json-glib
+SCANGOBJ_OPTIONS = 
+SCAN_OPTIONS = --deprecated-guards="JSON_DISABLE_DEPRECATED" --rebuild-types
+MKDB_OPTIONS = --output-format=xml --name-space=json
+MKTMPL_OPTIONS = 
+FIXXREF_OPTIONS = \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
+
+HFILE_GLOB = $(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
+CFILE_GLOB = $(top_srcdir)/json-glib/*.c
+IGNORE_HFILES = \
+       config.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       \
+       json-debug.h
+
+EXTRA_HFILES = 
+HTML_IMAGES = 
+content_files = \
+       json-glib-format.xml \
+       json-glib-validate.xml
+
+expand_content_files = 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = 
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+SETUP_FILES = \
+       $(content_files)                \
+       $(expand_content_files)         \
+       $(DOC_MAIN_SGML_FILE)           \
+       $(DOC_MODULE)-sections.txt      \
+       $(DOC_MODULE)-overrides.txt
+
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) $(man_MANS)
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
+       html-build.stamp pdf-build.stamp \
+       sgml.stamp html.stamp pdf.stamp
+
+SCANOBJ_FILES = \
+       $(DOC_MODULE).args       \
+       $(DOC_MODULE).hierarchy  \
+       $(DOC_MODULE).interfaces \
+       $(DOC_MODULE).prerequisites \
+       $(DOC_MODULE).signals
+
+REPORT_FILES = \
+       $(DOC_MODULE)-undocumented.txt \
+       $(DOC_MODULE)-undeclared.txt \
+       $(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
+       gtkdoc-check.test $(man_MANS)
+@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
+@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
+@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
+@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
+man_MANS = $(am__append_1)
+@ENABLE_GTK_DOC_TRUE@TESTS_ENVIRONMENT = \
+@ENABLE_GTK_DOC_TRUE@  DOC_MODULE=$(DOC_MODULE) \
+@ENABLE_GTK_DOC_TRUE@  DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+@ENABLE_GTK_DOC_TRUE@  SRCDIR=$(abs_srcdir) \
+@ENABLE_GTK_DOC_TRUE@  BUILDDIR=$(abs_builddir)
+
+@ENABLE_GTK_DOC_TRUE@TESTS = $(GTKDOC_CHECK)
+@ENABLE_MAN_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_MAN_TRUE@      --nonet \
+@ENABLE_MAN_TRUE@      --stringparam man.output.quietly 1 \
+@ENABLE_MAN_TRUE@      --stringparam funcsynopsis.style ansi \
+@ENABLE_MAN_TRUE@      --stringparam man.th.extra1.suppress 1 \
+@ENABLE_MAN_TRUE@      --stringparam man.authors.section.enabled 0 \
+@ENABLE_MAN_TRUE@      --stringparam man.copyright.section.enabled 0
+
+all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+.SUFFIXES: .1 .log .test .test$(EXEEXT) .trs .xml
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -404,6 +686,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
        esac;
+$(top_srcdir)/gtk-doc.make $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -419,105 +702,211 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-       @fail=; \
-       if $(am__make_keepgoing); then \
-         failcom='fail=yes'; \
-       else \
-         failcom='exit 1'; \
-       fi; \
-       dot_seen=no; \
-       target=`echo $@ | sed s/-recursive//`; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       for subdir in $$list; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done; \
-       if test "$$dot_seen" = "no"; then \
-         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-       fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-       $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-       set x; \
-       here=`pwd`; \
-       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-         include_option=--etags-include; \
-         empty_fix=.; \
-       else \
-         include_option=--include; \
-         empty_fix=; \
+install-man1: $(man_MANS)
+       @$(NORMAL_INSTALL)
+       @list1=''; \
+       list2='$(man_MANS)'; \
+       test -n "$(man1dir)" \
+         && test -n "`echo $$list1$$list2`" \
+         || exit 0; \
+       echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+       $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+       { for i in $$list1; do echo "$$i"; done;  \
+       if test -n "$$list2"; then \
+         for i in $$list2; do echo "$$i"; done \
+           | sed -n '/\.1[a-z]*$$/p'; \
        fi; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           test ! -f $$subdir/TAGS || \
-             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+       } | while read p; do \
+         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; echo "$$p"; \
+       done | \
+       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+       sed 'N;N;s,\n, ,g' | { \
+       list=; while read file base inst; do \
+         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
          fi; \
        done; \
-       $(am__define_uniq_tagged_files); \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
+       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+       while read files; do \
+         test -z "$$files" || { \
+           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+           $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+       done; }
+
+uninstall-man1:
+       @$(NORMAL_UNINSTALL)
+       @list=''; test -n "$(man1dir)" || exit 0; \
+       files=`{ for i in $$list; do echo "$$i"; done; \
+       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+         sed -n '/\.1[a-z]*$$/p'; \
+       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+       dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+       rm -f $< $@
+       $(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+       @:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+       @$(am__set_TESTS_bases); \
+       am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+       redo_bases=`for i in $$bases; do \
+                     am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+                   done`; \
+       if test -n "$$redo_bases"; then \
+         redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+         redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+         if $(am__make_dryrun); then :; else \
+           rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
          fi; \
+       fi; \
+       if test -n "$$am__remaking_logs"; then \
+         echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+              "recursion detected" >&2; \
+       elif test -n "$$redo_logs"; then \
+         am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+       fi; \
+       if $(am__make_dryrun); then :; else \
+         st=0;  \
+         errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+         for i in $$redo_bases; do \
+           test -f $$i.trs && test -r $$i.trs \
+             || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+           test -f $$i.log && test -r $$i.log \
+             || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+         done; \
+         test $$st -eq 0 || exit 1; \
        fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-       $(am__define_uniq_tagged_files); \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-       list='$(am__tagged_files)'; \
-       case "$(srcdir)" in \
-         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-         *) sdir=$(subdir)/$(srcdir) ;; \
-       esac; \
-       for i in $$list; do \
-         if test -f "$$i"; then \
-           echo "$(subdir)/$$i"; \
-         else \
-           echo "$$sdir/$$i"; \
-         fi; \
-       done >> $(top_builddir)/cscope.files
+       @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+       ws='[   ]'; \
+       results=`for b in $$bases; do echo $$b.trs; done`; \
+       test -n "$$results" || results=/dev/null; \
+       all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+       pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+       fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+       skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+       xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+       xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+       error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+       if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+         success=true; \
+       else \
+         success=false; \
+       fi; \
+       br='==================='; br=$$br$$br$$br$$br; \
+       result_count () \
+       { \
+           if test x"$$1" = x"--maybe-color"; then \
+             maybe_colorize=yes; \
+           elif test x"$$1" = x"--no-color"; then \
+             maybe_colorize=no; \
+           else \
+             echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+           fi; \
+           shift; \
+           desc=$$1 count=$$2; \
+           if test $$maybe_colorize = yes && test $$count -gt 0; then \
+             color_start=$$3 color_end=$$std; \
+           else \
+             color_start= color_end=; \
+           fi; \
+           echo "$${color_start}# $$desc $$count$${color_end}"; \
+       }; \
+       create_testsuite_report () \
+       { \
+         result_count $$1 "TOTAL:" $$all   "$$brg"; \
+         result_count $$1 "PASS: " $$pass  "$$grn"; \
+         result_count $$1 "SKIP: " $$skip  "$$blu"; \
+         result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+         result_count $$1 "FAIL: " $$fail  "$$red"; \
+         result_count $$1 "XPASS:" $$xpass "$$red"; \
+         result_count $$1 "ERROR:" $$error "$$mgn"; \
+       }; \
+       {                                                               \
+         echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |       \
+           $(am__rst_title);                                           \
+         create_testsuite_report --no-color;                           \
+         echo;                                                         \
+         echo ".. contents:: :depth: 2";                               \
+         echo;                                                         \
+         for b in $$bases; do echo $$b; done                           \
+           | $(am__create_global_log);                                 \
+       } >$(TEST_SUITE_LOG).tmp || exit 1;                             \
+       mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);                     \
+       if $$success; then                                              \
+         col="$$grn";                                                  \
+        else                                                           \
+         col="$$red";                                                  \
+         test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);               \
+       fi;                                                             \
+       echo "$${col}$$br$${std}";                                      \
+       echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";   \
+       echo "$${col}$$br$${std}";                                      \
+       create_testsuite_report --maybe-color;                          \
+       echo "$$col$$br$$std";                                          \
+       if $$success; then :; else                                      \
+         echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";         \
+         if test -n "$(PACKAGE_BUGREPORT)"; then                       \
+           echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+         fi;                                                           \
+         echo "$$col$$br$$std";                                        \
+       fi;                                                             \
+       $$success || exit 1
 
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+check-TESTS:
+       @list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+       @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+       @set +e; $(am__set_TESTS_bases); \
+       log_list=`for i in $$bases; do echo $$i.log; done`; \
+       trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+       log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+       exit $$?;
+recheck: all 
+       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+       @set +e; $(am__set_TESTS_bases); \
+       bases=`for i in $$bases; do echo $$i; done \
+                | $(am__list_recheck_tests)` || exit 1; \
+       log_list=`for i in $$bases; do echo $$i.log; done`; \
+       log_list=`echo $$log_list`; \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+               am__force_recheck=am--force-recheck \
+               TEST_LOGS="$$log_list"; \
+       exit $$?
+.test.log:
+       @p='$<'; \
+       $(am__set_b); \
+       $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@      @p='$<'; \
+@am__EXEEXT_TRUE@      $(am__set_b); \
+@am__EXEEXT_TRUE@      $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@      --log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@      $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@      "$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -549,46 +938,27 @@ distdir: $(DISTFILES)
            || exit 1; \
          fi; \
        done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           $(am__make_dryrun) \
-             || test -d "$(distdir)/$$subdir" \
-             || $(MKDIR_P) "$(distdir)/$$subdir" \
-             || exit 1; \
-           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-           $(am__relativize); \
-           new_distdir=$$reldir; \
-           dir1=$$subdir; dir2="$(top_distdir)"; \
-           $(am__relativize); \
-           new_top_distdir=$$reldir; \
-           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-           ($(am__cd) $$subdir && \
-             $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$new_top_distdir" \
-               distdir="$$new_distdir" \
-               am__remove_distdir=: \
-               am__skip_length_check=: \
-               am__skip_mode_fix=: \
-               distdir) \
-             || exit 1; \
-         fi; \
-       done
+       $(MAKE) $(AM_MAKEFLAGS) \
+         top_distdir="$(top_distdir)" distdir="$(distdir)" \
+         dist-hook
 check-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) check-local
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+       $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+@ENABLE_GTK_DOC_FALSE@all-local:
+all-am: Makefile $(MANS) all-local
+installdirs:
+       for dir in "$(DESTDIR)$(man1dir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-strip:
        if test -z '$(STRIP)'; then \
          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -600,8 +970,12 @@ install-strip:
            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
        fi
 mostlyclean-generic:
+       -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+       -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+       -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -610,100 +984,295 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic distclean-local
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-html: html-recursive
+html: html-am
 
 html-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-data-local install-man
 
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-recursive
+install-html: install-html-am
 
 install-html-am:
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-info-am:
 
-install-man:
+install-man: install-man1
 
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
 
 install-pdf-am:
 
-install-ps: install-ps-recursive
+install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+       maintainer-clean-local
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-local uninstall-man
 
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
+uninstall-man: uninstall-man1
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-       check-am check-local clean clean-generic clean-libtool \
-       cscopelist-am ctags ctags-am distclean distclean-generic \
-       distclean-libtool distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
+.MAKE: check-am install-am install-strip
+
+.PHONY: all all-am all-local check check-TESTS check-am clean \
+       clean-generic clean-libtool clean-local cscopelist-am ctags-am \
+       dist-hook distclean distclean-generic distclean-libtool \
+       distclean-local distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am \
+       install-data-local install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-       uninstall-am
+       install-info-am install-man install-man1 install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic maintainer-clean-local mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       recheck tags-am uninstall uninstall-am uninstall-local \
+       uninstall-man uninstall-man1
 
 .PRECIOUS: Makefile
 
 
-test-report:
+gtkdoc-check.test: Makefile
+       $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+               echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+               chmod +x $@
+
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
+
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+$(REPORT_FILES): sgml-build.stamp
+
+setup-build.stamp:
+       -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+           files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
+           if test "x$$files" != "x" ; then \
+               for file in $$files ; do \
+                   destdir=`dirname $(abs_builddir)/$$file`; \
+                   test -d "$$destdir" || mkdir -p "$$destdir"; \
+                   test -f $(abs_srcdir)/$$file && \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+               done; \
+           fi; \
+       fi
+       $(AM_V_at)touch setup-build.stamp
+
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+       $(GTK_DOC_V_SCAN)_source_dir='' ; \
+       for i in $(DOC_SOURCE_DIR) ; do \
+           _source_dir="$${_source_dir} --source-dir=$$i" ; \
+       done ; \
+       gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+       $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+           scanobj_options=""; \
+           gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+           if test "$$?" = "0"; then \
+               if test "x$(V)" = "x1"; then \
+                   scanobj_options="--verbose"; \
+               fi; \
+           fi; \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+           gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+       else \
+           for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+           done \
+       fi
+       $(AM_V_at)touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
        @true
 
-test:
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
+       $(GTK_DOC_V_XML)_source_dir='' ; \
+       for i in $(DOC_SOURCE_DIR) ; do \
+           _source_dir="$${_source_dir} --source-dir=$$i" ; \
+       done ; \
+       gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+       $(AM_V_at)touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
        @true
 
-check-local: test
+xml/gtkdocentities.ent: Makefile
+       $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+               echo "<!ENTITY package \"$(PACKAGE)\">"; \
+               echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
+               echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
+               echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
+               echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
+               echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
+               echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
+       ) > $@
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+       $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+       mkhtml_options=""; \
+       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+       if test "$$?" = "0"; then \
+         if test "x$(V)" = "x1"; then \
+           mkhtml_options="$$mkhtml_options --verbose"; \
+         fi; \
+       fi; \
+       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+       if test "$$?" = "0"; then \
+         mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
+       fi; \
+       cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+       -@test "x$(HTML_IMAGES)" = "x" || \
+       for file in $(HTML_IMAGES) ; do \
+         if test -f $(abs_srcdir)/$$file ; then \
+           cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+         fi; \
+         if test -f $(abs_builddir)/$$file ; then \
+           cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+         fi; \
+       done;
+       $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       $(AM_V_at)touch html-build.stamp
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+       $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+       mkpdf_options=""; \
+       gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+       if test "$$?" = "0"; then \
+         if test "x$(V)" = "x1"; then \
+           mkpdf_options="$$mkpdf_options --verbose"; \
+         fi; \
+       fi; \
+       if test "x$(HTML_IMAGES)" != "x"; then \
+         for img in $(HTML_IMAGES); do \
+           part=`dirname $$img`; \
+           echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
+           if test $$? != 0; then \
+             mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
+           fi; \
+         done; \
+       fi; \
+       gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+       $(AM_V_at)touch pdf-build.stamp
+
+##############
+
+clean-local:
+       @rm -f *~ *.bak
+       @rm -rf .libs
+       @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+         rm -f $(DOC_MODULE).types; \
+       fi
+       @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+         rm -f $(DOC_MODULE)-sections.txt; \
+       fi
+
+distclean-local:
+       @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+           $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+       @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+           rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
+       fi
+
+maintainer-clean-local:
+       @rm -rf xml html
+
+install-data-local:
+       @installfiles=`echo $(builddir)/html/*`; \
+       if test "$$installfiles" = '$(builddir)/html/*'; \
+       then echo 1>&2 'Nothing to install' ; \
+       else \
+         if test -n "$(DOC_MODULE_VERSION)"; then \
+           installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+         else \
+           installdir="$(DESTDIR)$(TARGET_DIR)"; \
+         fi; \
+         $(mkinstalldirs) $${installdir} ; \
+         for i in $$installfiles; do \
+           echo ' $(INSTALL_DATA) '$$i ; \
+           $(INSTALL_DATA) $$i $${installdir}; \
+         done; \
+         if test -n "$(DOC_MODULE_VERSION)"; then \
+           mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+             $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+         fi; \
+         $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+       fi
+
+uninstall-local:
+       @if test -n "$(DOC_MODULE_VERSION)"; then \
+         installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+       else \
+         installdir="$(DESTDIR)$(TARGET_DIR)"; \
+       fi; \
+       rm -rf $${installdir}
+
+#
+# Require gtk-doc when making dist
+#
+@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
+@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc is needed to run 'make dist'.         ***"
+@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc was not found when 'configure' ran.   ***"
+@HAVE_GTK_DOC_FALSE@   @echo "*** please install gtk-doc and rerun 'configure'. ***"
+@HAVE_GTK_DOC_FALSE@   @false
+
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
+       @mkdir $(distdir)/html
+       @cp ./html/* $(distdir)/html
+       @-cp ./$(DOC_MODULE).pdf $(distdir)/
+       @-cp ./$(DOC_MODULE).types $(distdir)/
+       @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+       @cd $(distdir) && rm -f $(DISTCLEANFILES)
+       @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
+
+@ENABLE_MAN_TRUE@.xml.1:
+@ENABLE_MAN_TRUE@      $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-.PHONY: test-report test check-local
+CLEANFILES ?=
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
similarity index 89%
rename from doc/reference/html/JsonBuilder.html
rename to doc/html/JsonBuilder.html
index 9fa9a90..5c3a3cf 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Generator">
 <link rel="prev" href="JsonGenerator.html" title="JsonGenerator">
 <link rel="next" href="ch04.html" title="General Purpose API">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <col width="200px" class="properties_flags">
 </colgroup>
 <tbody><tr>
-<td class="property_type"><span class="type">gboolean</span></td>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
 <td class="property_name"><a class="link" href="JsonBuilder.html#JsonBuilder--immutable" title="The “immutable” property">immutable</a></td>
 <td class="property_flags">Read / Write / Construct Only</td>
 </tr></tbody>
 </div>
 <div class="refsect1">
 <a name="JsonBuilder.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GObject
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> JsonBuilder
 </pre>
 </div>
 <div class="refsect1">
+<a name="JsonBuilder.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="JsonBuilder.description"></a><h2>Description</h2>
 <p><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> provides an object for generating a JSON tree.
 You can generate only one tree with one <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> instance.</p>
@@ -233,7 +238,7 @@ JSON tree and obtain the root <a class="link" href="json-glib-JSON-Node.html#Jso
 <pre class="programlisting"><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="returnvalue">JsonBuilder</span></a> *
 json_builder_new_immutable (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Creates a new <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> instance with its <a class="link" href="JsonBuilder.html#JsonBuilder--immutable" title="The “immutable” property"><span class="type">“immutable”</span></a> property
-set to <code class="literal">TRUE</code> to create immutable output trees.</p>
+set to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to create immutable output trees.</p>
 <div class="refsect3">
 <a name="json-builder-new-immutable.returns"></a><h4>Returns</h4>
 <p> a new <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>. </p>
@@ -265,7 +270,7 @@ json_builder_get_root (<em class="parameter"><code><a class="link" href="JsonBui
 </div>
 <div class="refsect3">
 <a name="json-builder-get-root.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <code class="literal">NULL</code> if the build is not complete.
+<p> the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the build is not complete.
 Free the returned value with <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_node_unref ()"><code class="function">json_node_unref()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -320,7 +325,7 @@ or an array element.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-begin-array.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -350,7 +355,7 @@ recent call to <a class="link" href="JsonBuilder.html#json-builder-begin-array"
 </div>
 <div class="refsect3">
 <a name="json-builder-end-array.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -381,7 +386,7 @@ or an array element.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-begin-object.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -390,7 +395,7 @@ or an array element.</p>
 <a name="json-builder-set-member-name"></a><h3>json_builder_set_member_name ()</h3>
 <pre class="programlisting"><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="returnvalue">JsonBuilder</span></a> *
 json_builder_set_member_name (<em class="parameter"><code><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> *builder</code></em>,
-                              <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                              <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Set the name of the next member in an object. The next call must add a value,
 open an object or an array.</p>
 <p>Can be called only if the call is associated to an object.</p>
@@ -418,7 +423,7 @@ open an object or an array.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-set-member-name.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -448,7 +453,7 @@ recent call to <a class="link" href="JsonBuilder.html#json-builder-begin-object"
 </div>
 <div class="refsect3">
 <a name="json-builder-end-object.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -488,7 +493,7 @@ recent opened array.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-add-value.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -497,7 +502,7 @@ recent opened array.</p>
 <a name="json-builder-add-int-value"></a><h3>json_builder_add_int_value ()</h3>
 <pre class="programlisting"><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="returnvalue">JsonBuilder</span></a> *
 json_builder_add_int_value (<em class="parameter"><code><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> *builder</code></em>,
-                            <em class="parameter"><code><span class="type">gint64</span> value</code></em>);</pre>
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> value</code></em>);</pre>
 <p>If called after <a class="link" href="JsonBuilder.html#json-builder-set-member-name" title="json_builder_set_member_name ()"><code class="function">json_builder_set_member_name()</code></a>, sets <em class="parameter"><code>value</code></em>
  as member of the
 most recent opened object, otherwise <em class="parameter"><code>value</code></em>
@@ -528,7 +533,7 @@ recent opened array.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-add-int-value.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -537,7 +542,7 @@ recent opened array.</p>
 <a name="json-builder-add-double-value"></a><h3>json_builder_add_double_value ()</h3>
 <pre class="programlisting"><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="returnvalue">JsonBuilder</span></a> *
 json_builder_add_double_value (<em class="parameter"><code><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> *builder</code></em>,
-                               <em class="parameter"><code><span class="type">gdouble</span> value</code></em>);</pre>
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>);</pre>
 <p>If called after <a class="link" href="JsonBuilder.html#json-builder-set-member-name" title="json_builder_set_member_name ()"><code class="function">json_builder_set_member_name()</code></a>, sets <em class="parameter"><code>value</code></em>
  as member of the
 most recent opened object, otherwise <em class="parameter"><code>value</code></em>
@@ -568,7 +573,7 @@ recent opened array.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-add-double-value.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -577,7 +582,7 @@ recent opened array.</p>
 <a name="json-builder-add-boolean-value"></a><h3>json_builder_add_boolean_value ()</h3>
 <pre class="programlisting"><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="returnvalue">JsonBuilder</span></a> *
 json_builder_add_boolean_value (<em class="parameter"><code><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> *builder</code></em>,
-                                <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);</pre>
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
 <p>If called after <a class="link" href="JsonBuilder.html#json-builder-set-member-name" title="json_builder_set_member_name ()"><code class="function">json_builder_set_member_name()</code></a>, sets <em class="parameter"><code>value</code></em>
  as member of the
 most recent opened object, otherwise <em class="parameter"><code>value</code></em>
@@ -608,7 +613,7 @@ recent opened array.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-add-boolean-value.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -617,7 +622,7 @@ recent opened array.</p>
 <a name="json-builder-add-string-value"></a><h3>json_builder_add_string_value ()</h3>
 <pre class="programlisting"><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="returnvalue">JsonBuilder</span></a> *
 json_builder_add_string_value (<em class="parameter"><code><a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> *builder</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *value</code></em>);</pre>
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);</pre>
 <p>If called after <a class="link" href="JsonBuilder.html#json-builder-set-member-name" title="json_builder_set_member_name ()"><code class="function">json_builder_set_member_name()</code></a>, sets <em class="parameter"><code>value</code></em>
  as member of the
 most recent opened object, otherwise <em class="parameter"><code>value</code></em>
@@ -648,7 +653,7 @@ recent opened array.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-add-string-value.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -678,7 +683,7 @@ recent opened array.</p>
 </div>
 <div class="refsect3">
 <a name="json-builder-add-null-value.returns"></a><h4>Returns</h4>
-<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <code class="literal">NULL</code> if the call was inconsistent. </p>
+<p> the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the call was inconsistent. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -706,7 +711,7 @@ accessed using the provided API</p>
 <a name="JsonBuilder.property-details"></a><h2>Property Details</h2>
 <div class="refsect2">
 <a name="JsonBuilder--immutable"></a><h3>The <code class="literal">“immutable”</code> property</h3>
-<pre class="programlisting">  “immutable”                <span class="type">gboolean</span></pre>
+<pre class="programlisting">  “immutable”                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
 <p>Whether the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> tree built by the <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> should be immutable
 when created. Making the output immutable on creation avoids the expense
 of traversing it to make it immutable later.</p>
@@ -721,6 +726,6 @@ of traversing it to make it immutable later.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 79%
rename from doc/reference/html/JsonGenerator.html
rename to doc/html/JsonGenerator.html
index ec7de2a..736a08f 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Generator">
 <link rel="prev" href="ch03.html" title="Generator">
 <link rel="next" href="JsonBuilder.html" title="JsonBuilder">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -75,7 +75,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonGenerator.html#json-generator-get-pretty" title="json_generator_get_pretty ()">json_generator_get_pretty</a> <span class="c_punctuation">()</span>
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonGenerator.html#json-generator-get-indent" title="json_generator_get_indent ()">json_generator_get_indent</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gunichar</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Unicode-Manipulation.html#gunichar"><span class="returnvalue">gunichar</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonGenerator.html#json-generator-get-indent-char" title="json_generator_get_indent_char ()">json_generator_get_indent_char</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonGenerator.html#json-generator-to-file" title="json_generator_to_file ()">json_generator_to_file</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gchar</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="JsonGenerator.html#json-generator-to-data" title="json_generator_to_data ()">json_generator_to_data</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonGenerator.html#json-generator-to-stream" title="json_generator_to_stream ()">json_generator_to_stream</a> <span class="c_punctuation">()</span>
 </colgroup>
 <tbody>
 <tr>
-<td class="property_type"><span class="type">guint</span></td>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
 <td class="property_name"><a class="link" href="JsonGenerator.html#JsonGenerator--indent" title="The “indent” property">indent</a></td>
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
-<td class="property_type"><span class="type">guint</span></td>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
 <td class="property_name"><a class="link" href="JsonGenerator.html#JsonGenerator--indent-char" title="The “indent-char” property">indent-char</a></td>
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
-<td class="property_type"><span class="type">gboolean</span></td>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
 <td class="property_name"><a class="link" href="JsonGenerator.html#JsonGenerator--pretty" title="The “pretty” property">pretty</a></td>
 <td class="property_flags">Read / Write</td>
 </tr>
 </div>
 <div class="refsect1">
 <a name="JsonGenerator.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GObject
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> JsonGenerator
 </pre>
 </div>
 <div class="refsect1">
+<a name="JsonGenerator.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="JsonGenerator.description"></a><h2>Description</h2>
 <p><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> provides an object for generating a JSON data stream and
 put it into a buffer or a file.</p>
@@ -276,7 +281,7 @@ json_generator_get_root (<em class="parameter"><code><a class="link" href="JsonG
 </div>
 <div class="refsect3">
 <a name="json-generator-get-root.returns"></a><h4>Returns</h4>
-<p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <code class="literal">NULL</code>. The returned node
+<p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. The returned node
 is owned by the <a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> and it should not be freed. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -287,7 +292,7 @@ is owned by the <a class="link" href="JsonGenerator.html" title="JsonGenerator">
 <a name="json-generator-set-pretty"></a><h3>json_generator_set_pretty ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_generator_set_pretty (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>,
-                           <em class="parameter"><code><span class="type">gboolean</span> is_pretty</code></em>);</pre>
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> is_pretty</code></em>);</pre>
 <p>Sets whether the generated JSON should be pretty printed, using the
 indentation character specified in the <a class="link" href="JsonGenerator.html#JsonGenerator--indent-char" title="The “indent-char” property"><span class="type">“indent-char”</span></a>
 property and the spacing specified in <a class="link" href="JsonGenerator.html#JsonGenerator--indent" title="The “indent” property"><span class="type">“indent”</span></a> property.</p>
@@ -318,7 +323,7 @@ property and the spacing specified in <a class="link" href="JsonGenerator.html#J
 <hr>
 <div class="refsect2">
 <a name="json-generator-get-pretty"></a><h3>json_generator_get_pretty ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_generator_get_pretty (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>);</pre>
 <p>Retrieves the value set using <a class="link" href="JsonGenerator.html#json-generator-set-pretty" title="json_generator_set_pretty ()"><code class="function">json_generator_set_pretty()</code></a>.</p>
 <div class="refsect3">
@@ -338,8 +343,8 @@ json_generator_get_pretty (<em class="parameter"><code><a class="link" href="Jso
 </div>
 <div class="refsect3">
 <a name="json-generator-get-pretty.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the generated JSON should be pretty-printed, and
-<code class="literal">FALSE</code> otherwise</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the generated JSON should be pretty-printed, and
+<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
 </div>
@@ -348,7 +353,7 @@ json_generator_get_pretty (<em class="parameter"><code><a class="link" href="Jso
 <a name="json-generator-set-indent"></a><h3>json_generator_set_indent ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_generator_set_indent (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>,
-                           <em class="parameter"><code><span class="type">guint</span> indent_level</code></em>);</pre>
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> indent_level</code></em>);</pre>
 <p>Sets the number of repetitions for each indentation level.</p>
 <div class="refsect3">
 <a name="json-generator-set-indent.parameters"></a><h4>Parameters</h4>
@@ -378,7 +383,7 @@ that should be applied when pretty printing</p></td>
 <hr>
 <div class="refsect2">
 <a name="json-generator-get-indent"></a><h3>json_generator_get_indent ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 json_generator_get_indent (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>);</pre>
 <p>Retrieves the value set using <a class="link" href="JsonGenerator.html#json-generator-set-indent" title="json_generator_set_indent ()"><code class="function">json_generator_set_indent()</code></a>.</p>
 <div class="refsect3">
@@ -407,7 +412,7 @@ json_generator_get_indent (<em class="parameter"><code><a class="link" href="Jso
 <a name="json-generator-set-indent-char"></a><h3>json_generator_set_indent_char ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_generator_set_indent_char (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>,
-                                <em class="parameter"><code><span class="type">gunichar</span> indent_char</code></em>);</pre>
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Unicode-Manipulation.html#gunichar"><span class="type">gunichar</span></a> indent_char</code></em>);</pre>
 <p>Sets the character to be used when indenting</p>
 <div class="refsect3">
 <a name="json-generator-set-indent-char.parameters"></a><h4>Parameters</h4>
@@ -436,7 +441,7 @@ json_generator_set_indent_char (<em class="parameter"><code><a class="link" href
 <hr>
 <div class="refsect2">
 <a name="json-generator-get-indent-char"></a><h3>json_generator_get_indent_char ()</h3>
-<pre class="programlisting"><span class="returnvalue">gunichar</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Unicode-Manipulation.html#gunichar"><span class="returnvalue">gunichar</span></a>
 json_generator_get_indent_char (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>);</pre>
 <p>Retrieves the value set using <a class="link" href="JsonGenerator.html#json-generator-set-indent-char" title="json_generator_set_indent_char ()"><code class="function">json_generator_set_indent_char()</code></a>.</p>
 <div class="refsect3">
@@ -463,10 +468,10 @@ json_generator_get_indent_char (<em class="parameter"><code><a class="link" href
 <hr>
 <div class="refsect2">
 <a name="json-generator-to-file"></a><h3>json_generator_to_file ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_generator_to_file (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *filename</code></em>,
-                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *filename</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Creates a JSON data stream and puts it inside <em class="parameter"><code>filename</code></em>
 , overwriting the
 current file contents. This operation is atomic.</p>
@@ -491,7 +496,7 @@ current file contents. This operation is atomic.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -499,15 +504,15 @@ current file contents. This operation is atomic.</p>
 </div>
 <div class="refsect3">
 <a name="json-generator-to-file.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if saving was successful.</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if saving was successful.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-generator-to-data"></a><h3>json_generator_to_data ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_generator_to_data (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>,
-                        <em class="parameter"><code><span class="type">gsize</span> *length</code></em>);</pre>
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> *length</code></em>);</pre>
 <p>Generates a JSON data stream from <em class="parameter"><code>generator</code></em>
  and returns it as a
 buffer.</p>
@@ -528,7 +533,7 @@ buffer.</p>
 <tr>
 <td class="parameter_name"><p>length</p></td>
 <td class="parameter_description"><p> return location for the length of the returned
-buffer, or <code class="literal">NULL</code>. </p></td>
+buffer, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -537,17 +542,17 @@ buffer, or <code class="literal">NULL</code>. </p></td>
 <div class="refsect3">
 <a name="json-generator-to-data.returns"></a><h4>Returns</h4>
 <p> a newly allocated buffer holding a JSON data stream.
-Use <code class="function">g_free()</code> to free the allocated resources.</p>
+Use <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a> to free the allocated resources.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-generator-to-stream"></a><h3>json_generator_to_stream ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_generator_to_stream (<em class="parameter"><code><a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> *generator</code></em>,
-                          <em class="parameter"><code><span class="type">GOutputStream</span> *stream</code></em>,
-                          <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
-                          <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                          <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GOutputStream.html#GOutputStream-struct"><span class="type">GOutputStream</span></a> *stream</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Outputs JSON data and streams it (synchronously) to <em class="parameter"><code>stream</code></em>
 .</p>
 <div class="refsect3">
@@ -566,17 +571,17 @@ json_generator_to_stream (<em class="parameter"><code><a class="link" href="Json
 </tr>
 <tr>
 <td class="parameter_name"><p>stream</p></td>
-<td class="parameter_description"><p>a <span class="type">GOutputStream</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gio/unstable/GOutputStream.html#GOutputStream-struct"><span class="type">GOutputStream</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>cancellable</p></td>
-<td class="parameter_description"><p> a <span class="type">GCancellable</span>, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> a <a href="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -584,8 +589,8 @@ json_generator_to_stream (<em class="parameter"><code><a class="link" href="Json
 </div>
 <div class="refsect3">
 <a name="json-generator-to-stream.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the write operation was successful, and <code class="literal">FALSE</code>
-on failure. In case of error, the <span class="type">GError</span> will be filled accordingly</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the write operation was successful, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
+on failure. In case of error, the <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> will be filled accordingly</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
 </div>
@@ -611,7 +616,7 @@ are private and should only be accessed via the provided API.</p>
 <a name="JsonGenerator.property-details"></a><h2>Property Details</h2>
 <div class="refsect2">
 <a name="JsonGenerator--indent"></a><h3>The <code class="literal">“indent”</code> property</h3>
-<pre class="programlisting">  “indent”                   <span class="type">guint</span></pre>
+<pre class="programlisting">  “indent”                   <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
 <p>Number of spaces to be used to indent when pretty printing.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: 2</p>
@@ -619,7 +624,7 @@ are private and should only be accessed via the provided API.</p>
 <hr>
 <div class="refsect2">
 <a name="JsonGenerator--indent-char"></a><h3>The <code class="literal">“indent-char”</code> property</h3>
-<pre class="programlisting">  “indent-char”              <span class="type">guint</span></pre>
+<pre class="programlisting">  “indent-char”              <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
 <p>The character that should be used when indenting in pretty print.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: ' '</p>
@@ -628,7 +633,7 @@ are private and should only be accessed via the provided API.</p>
 <hr>
 <div class="refsect2">
 <a name="JsonGenerator--pretty"></a><h3>The <code class="literal">“pretty”</code> property</h3>
-<pre class="programlisting">  “pretty”                   <span class="type">gboolean</span></pre>
+<pre class="programlisting">  “pretty”                   <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
 <p>Whether the output should be "pretty-printed", with indentation and
 newlines. The indentation level can be controlled by using the
 JsonGenerator:indent property</p>
@@ -647,6 +652,6 @@ stream.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 77%
rename from doc/reference/html/JsonParser.html
rename to doc/html/JsonParser.html
index a233071..0c90d9a 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Parser">
 <link rel="prev" href="ch02.html" title="Parser">
 <link rel="next" href="JsonReader.html" title="JsonReader">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -60,7 +60,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonParser.html#json-parser-load-from-file" title="json_parser_load_from_file ()">json_parser_load_from_file</a> <span class="c_punctuation">()</span>
@@ -68,7 +68,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonParser.html#json-parser-load-from-data" title="json_parser_load_from_data ()">json_parser_load_from_data</a> <span class="c_punctuation">()</span>
@@ -76,7 +76,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonParser.html#json-parser-load-from-stream" title="json_parser_load_from_stream ()">json_parser_load_from_stream</a> <span class="c_punctuation">()</span>
@@ -92,7 +92,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonParser.html#json-parser-load-from-stream-finish" title="json_parser_load_from_stream_finish ()">json_parser_load_from_stream_finish</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonParser.html#json-parser-get-current-line" title="json_parser_get_current_line ()">json_parser_get_current_line</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonParser.html#json-parser-get-current-pos" title="json_parser_get_current_pos ()">json_parser_get_current_pos</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonParser.html#json-parser-has-assignment" title="json_parser_has_assignment ()">json_parser_has_assignment</a> <span class="c_punctuation">()</span>
 <col width="200px" class="properties_flags">
 </colgroup>
 <tbody><tr>
-<td class="property_type"><span class="type">gboolean</span></td>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
 <td class="property_name"><a class="link" href="JsonParser.html#JsonParser--immutable" title="The “immutable” property">immutable</a></td>
 <td class="property_flags">Read / Write / Construct Only</td>
 </tr></tbody>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-array-element" title="The “array-element” signal">array-element</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-array-end" title="The “array-end” signal">array-end</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-array-start" title="The “array-start” signal">array-start</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-error" title="The “error” signal">error</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-object-end" title="The “object-end” signal">object-end</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-object-member" title="The “object-member” signal">object-member</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-object-start" title="The “object-start” signal">object-start</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-parse-end" title="The “parse-end” signal">parse-end</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="JsonParser.html#JsonParser-parse-start" title="The “parse-start” signal">parse-start</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="JsonParser.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GObject
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> JsonParser
 </pre>
 </div>
 <div class="refsect1">
+<a name="JsonParser.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="JsonParser.description"></a><h2>Description</h2>
 <p><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> provides an object for parsing a JSON data stream, either
 inside a file or inside a static buffer.</p>
@@ -250,7 +255,7 @@ load a JSON stream from either a file or a buffer and then walk the
 hierarchy using the data types API.</p>
 <div class="refsect3">
 <a name="json-parser-new.returns"></a><h4>Returns</h4>
-<p> the newly created <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>. Use <code class="function">g_object_unref()</code>
+<p> the newly created <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>. Use <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>
 to release all the memory it allocates.</p>
 </div>
 </div>
@@ -260,7 +265,7 @@ to release all the memory it allocates.</p>
 <pre class="programlisting"><a class="link" href="JsonParser.html" title="JsonParser"><span class="returnvalue">JsonParser</span></a> *
 json_parser_new_immutable (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Creates a new <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> instance with its <a class="link" href="JsonParser.html#JsonParser--immutable" title="The “immutable” property"><span class="type">“immutable”</span></a> property
-set to <code class="literal">TRUE</code> to create immutable output trees.</p>
+set to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to create immutable output trees.</p>
 <div class="refsect3">
 <a name="json-parser-new-immutable.returns"></a><h4>Returns</h4>
 <p> a new <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>. </p>
@@ -271,10 +276,10 @@ set to <code class="literal">TRUE</code> to create immutable output trees.</p>
 <hr>
 <div class="refsect2">
 <a name="json-parser-load-from-file"></a><h3>json_parser_load_from_file ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_parser_load_from_file (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>,
-                            <em class="parameter"><code>const <span class="type">gchar</span> *filename</code></em>,
-                            <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                            <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *filename</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Loads a JSON stream from the content of <em class="parameter"><code>filename</code></em>
  and parses it. See
 <a class="link" href="JsonParser.html#json-parser-load-from-data" title="json_parser_load_from_data ()"><code class="function">json_parser_load_from_data()</code></a>.</p>
@@ -299,7 +304,7 @@ json_parser_load_from_file (<em class="parameter"><code><a class="link" href="Js
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -307,19 +312,19 @@ json_parser_load_from_file (<em class="parameter"><code><a class="link" href="Js
 </div>
 <div class="refsect3">
 <a name="json-parser-load-from-file.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the file was successfully loaded and parsed.
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the file was successfully loaded and parsed.
 In case of error, <em class="parameter"><code>error</code></em>
-is set accordingly and <code class="literal">FALSE</code> is returned</p>
+is set accordingly and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-parser-load-from-data"></a><h3>json_parser_load_from_data ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_parser_load_from_data (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>,
-                            <em class="parameter"><code>const <span class="type">gchar</span> *data</code></em>,
-                            <em class="parameter"><code><span class="type">gssize</span> length</code></em>,
-                            <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                            <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *data</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> length</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Loads a JSON stream from a buffer and parses it. You can call this function
 multiple times with the same <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> object, but the contents of the
 parser will be destroyed each time.</p>
@@ -349,7 +354,7 @@ parser will be destroyed each time.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -357,25 +362,25 @@ parser will be destroyed each time.</p>
 </div>
 <div class="refsect3">
 <a name="json-parser-load-from-data.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the buffer was succesfully parser. In case
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the buffer was succesfully parser. In case
 of error, <em class="parameter"><code>error</code></em>
-is set accordingly and <code class="literal">FALSE</code> is returned</p>
+is set accordingly and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-parser-load-from-stream"></a><h3>json_parser_load_from_stream ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_parser_load_from_stream (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>,
-                              <em class="parameter"><code><span class="type">GInputStream</span> *stream</code></em>,
-                              <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
-                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                              <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GInputStream.html#GInputStream-struct"><span class="type">GInputStream</span></a> *stream</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Loads the contents of an input stream and parses them.</p>
 <p>If <em class="parameter"><code>cancellable</code></em>
- is not <code class="literal">NULL</code>, then the operation can be cancelled by
+ is not <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, then the operation can be cancelled by
 triggering the <em class="parameter"><code>cancellable</code></em>
  object from another thread. If the
-operation was cancelled, the error <code class="literal">G_IO_ERROR_CANCELLED</code> will be set
+operation was cancelled, the error <a href="https://developer.gnome.org/gio/unstable/gio-GIOError.html#G-IO-ERROR-CANCELLED:CAPS"><code class="literal">G_IO_ERROR_CANCELLED</code></a> will be set
 on the passed <em class="parameter"><code>error</code></em>
 .</p>
 <div class="refsect3">
@@ -394,17 +399,17 @@ on the passed <em class="parameter"><code>error</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>stream</p></td>
-<td class="parameter_description"><p>an open <span class="type">GInputStream</span></p></td>
+<td class="parameter_description"><p>an open <a href="https://developer.gnome.org/gio/unstable/GInputStream.html#GInputStream-struct"><span class="type">GInputStream</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>cancellable</p></td>
-<td class="parameter_description"><p> a <span class="type">GCancellable</span>, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> a <a href="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>the return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>the return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -412,8 +417,8 @@ on the passed <em class="parameter"><code>error</code></em>
 </div>
 <div class="refsect3">
 <a name="json-parser-load-from-stream.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the data stream was successfully read and
-parsed, and <code class="literal">FALSE</code> otherwise</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the data stream was successfully read and
+parsed, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
 </div>
@@ -422,10 +427,10 @@ parsed, and <code class="literal">FALSE</code> otherwise</p>
 <a name="json-parser-load-from-stream-async"></a><h3>json_parser_load_from_stream_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_parser_load_from_stream_async (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>,
-                                    <em class="parameter"><code><span class="type">GInputStream</span> *stream</code></em>,
-                                    <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
-                                    <em class="parameter"><code><span class="type">GAsyncReadyCallback</span> callback</code></em>,
-                                    <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GInputStream.html#GInputStream-struct"><span class="type">GInputStream</span></a> *stream</code></em>,
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Asynchronously reads the contents of <em class="parameter"><code>stream</code></em>
 .</p>
 <p>For more details, see <a class="link" href="JsonParser.html#json-parser-load-from-stream" title="json_parser_load_from_stream ()"><code class="function">json_parser_load_from_stream()</code></a> which is the
@@ -450,17 +455,17 @@ of the operation.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>stream</p></td>
-<td class="parameter_description"><p>a <span class="type">GInputStream</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gio/unstable/GInputStream.html#GInputStream-struct"><span class="type">GInputStream</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>cancellable</p></td>
-<td class="parameter_description"><p> a <span class="type">GCancellable</span>, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> a <a href="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>callback</p></td>
-<td class="parameter_description"><p>a <span class="type">GAsyncReadyCallback</span> to call when the request is satisfied</p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> to call when the request is satisfied</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -477,10 +482,10 @@ of the operation.</p>
 <hr>
 <div class="refsect2">
 <a name="json-parser-load-from-stream-finish"></a><h3>json_parser_load_from_stream_finish ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_parser_load_from_stream_finish (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>,
-                                     <em class="parameter"><code><span class="type">GAsyncResult</span> *result</code></em>,
-                                     <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                                     <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a> *result</code></em>,
+                                     <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Finishes an asynchronous stream loading started with
 <a class="link" href="JsonParser.html#json-parser-load-from-stream-async" title="json_parser_load_from_stream_async ()"><code class="function">json_parser_load_from_stream_async()</code></a>.</p>
 <div class="refsect3">
@@ -499,12 +504,12 @@ json_parser_load_from_stream_finish (<em class="parameter"><code><a class="link"
 </tr>
 <tr>
 <td class="parameter_name"><p>result</p></td>
-<td class="parameter_description"><p>a <span class="type">GAsyncResult</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gio/unstable/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>the return location for a <span class="type">GError</span> or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>the return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -512,8 +517,8 @@ json_parser_load_from_stream_finish (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="json-parser-load-from-stream-finish.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the content of the stream was successfully retrieves
-and parsed, and <code class="literal">FALSE</code> otherwise. In case of error, the <span class="type">GError</span> will be
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the content of the stream was successfully retrieves
+and parsed, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise. In case of error, the <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> will be
 filled accordingly.</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
@@ -550,7 +555,7 @@ or freed. </p>
 <hr>
 <div class="refsect2">
 <a name="json-parser-get-current-line"></a><h3>json_parser_get_current_line ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 json_parser_get_current_line (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>);</pre>
 <p>Retrieves the line currently parsed, starting from 1.</p>
 <p>This function has defined behaviour only while parsing; calling this
@@ -579,7 +584,7 @@ yield 0.</p>
 <hr>
 <div class="refsect2">
 <a name="json-parser-get-current-pos"></a><h3>json_parser_get_current_pos ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 json_parser_get_current_pos (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>);</pre>
 <p>Retrieves the current position inside the current line, starting
 from 0.</p>
@@ -609,9 +614,9 @@ yield 0.</p>
 <hr>
 <div class="refsect2">
 <a name="json-parser-has-assignment"></a><h3>json_parser_has_assignment ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_parser_has_assignment (<em class="parameter"><code><a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser</code></em>,
-                            <em class="parameter"><code><span class="type">gchar</span> **variable_name</code></em>);</pre>
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> **variable_name</code></em>);</pre>
 <p>A JSON data stream might sometimes contain an assignment, like:</p>
 <div class="informalexample">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
@@ -647,7 +652,7 @@ used.</p>
 <tr>
 <td class="parameter_name"><p>variable_name</p></td>
 <td class="parameter_description"><p> Return location for the variable
-name, or <code class="literal">NULL</code>. </p></td>
+name, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -655,9 +660,9 @@ name, or <code class="literal">NULL</code>. </p></td>
 </div>
 <div class="refsect3">
 <a name="json-parser-has-assignment.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if there was an assignment, <code class="literal">FALSE</code> otherwise. If
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if there was an assignment, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise. If
 <em class="parameter"><code>variable_name</code></em>
-is not <code class="literal">NULL</code> it will be set to the name of the variable
+is not <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> it will be set to the name of the variable
 used in the assignment. The string is owned by <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> and should
 never be modified or freed.</p>
 </div>
@@ -836,7 +841,7 @@ private and should only be accessed via the provided API.</p>
 <a name="JsonParser.property-details"></a><h2>Property Details</h2>
 <div class="refsect2">
 <a name="JsonParser--immutable"></a><h3>The <code class="literal">“immutable”</code> property</h3>
-<pre class="programlisting">  “immutable”                <span class="type">gboolean</span></pre>
+<pre class="programlisting">  “immutable”                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
 <p>Whether the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> tree built by the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> should be immutable
 when created. Making the output immutable on creation avoids the expense
 of traversing it to make it immutable later.</p>
@@ -852,8 +857,8 @@ of traversing it to make it immutable later.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
                <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a>  *array,
-               <span class="type">gint</span>        index_,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>        index_,
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::array-element signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
 has successfully parsed a single element of a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a>. The
 array and element index are passed to the signal handlers.</p>
@@ -889,7 +894,7 @@ array and element index are passed to the signal handlers.</p>
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -897,7 +902,7 @@ array and element index are passed to the signal handlers.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
                <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a>  *array,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::array-end signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
 has successfully parsed an entire <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a></p>
 <div class="refsect3">
@@ -927,14 +932,14 @@ has successfully parsed an entire <a class="link" href="json-glib-JSON-Array.htm
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JsonParser-array-start"></a><h3>The <code class="literal">“array-start”</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::array-start signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
 starts parsing a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a></p>
 <div class="refsect3">
@@ -959,15 +964,15 @@ starts parsing a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><spa
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JsonParser-error"></a><h3>The <code class="literal">“error”</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
-               <span class="type">gpointer</span>    error,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    error,
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::error signal is emitted each time a <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> encounters
 an error in a JSON stream.</p>
 <div class="refsect3">
@@ -986,7 +991,7 @@ an error in a JSON stream.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>a pointer to the <span class="type">GError</span></p></td>
+<td class="parameter_description"><p>a pointer to the <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -997,7 +1002,7 @@ an error in a JSON stream.</p>
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1005,7 +1010,7 @@ an error in a JSON stream.</p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
                <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::object-end signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
 has successfully parsed an entire <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>.</p>
 <div class="refsect3">
@@ -1035,7 +1040,7 @@ has successfully parsed an entire <a class="link" href="json-glib-JSON-Object.ht
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1043,8 +1048,8 @@ has successfully parsed an entire <a class="link" href="json-glib-JSON-Object.ht
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
                <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object,
-               <span class="type">gchar</span>      *member_name,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>      *member_name,
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::object-member signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
 has successfully parsed a single member of a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>. The
 object and member are passed to the signal handlers.</p>
@@ -1080,14 +1085,14 @@ object and member are passed to the signal handlers.</p>
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JsonParser-object-start"></a><h3>The <code class="literal">“object-start”</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::object-start signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
 starts parsing a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>.</p>
 <div class="refsect3">
@@ -1112,14 +1117,14 @@ starts parsing a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><s
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JsonParser-parse-end"></a><h3>The <code class="literal">“parse-end”</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::parse-end signal is emitted when the parser successfully
 finished parsing a JSON data stream</p>
 <div class="refsect3">
@@ -1144,14 +1149,14 @@ finished parsing a JSON data stream</p>
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JsonParser-parse-start"></a><h3>The <code class="literal">“parse-start”</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> *parser,
-               <span class="type">gpointer</span>    user_data)</pre>
+               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>    user_data)</pre>
 <p>The ::parse-start signal is emitted when the parser began parsing
 a JSON data stream.</p>
 <div class="refsect3">
@@ -1176,11 +1181,11 @@ a JSON data stream.</p>
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 90%
rename from doc/reference/html/JsonPath.html
rename to doc/html/JsonPath.html
index 5a253ea..5f58c4e 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Parser">
 <link rel="prev" href="JsonReader.html" title="JsonReader">
 <link rel="next" href="ch03.html" title="Generator">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -50,7 +50,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonPath.html#json-path-compile" title="json_path_compile ()">json_path_compile</a> <span class="c_punctuation">()</span>
 </div>
 <div class="refsect1">
 <a name="JsonPath.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GObject
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> JsonPath
 </pre>
 </div>
 <div class="refsect1">
+<a name="JsonPath.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="JsonPath.description"></a><h2>Description</h2>
 <p><a class="link" href="JsonPath.html" title="JsonPath"><span class="type">JsonPath</span></a> is a simple class implementing the JSONPath syntax for extracting
 data out of a JSON tree. While the semantics of the JSONPath expressions are
@@ -123,7 +128,7 @@ the compilation of the new expression is successful.</p>
 <p>The simple convenience function <a class="link" href="JsonPath.html#json-path-query" title="json_path_query ()"><code class="function">json_path_query()</code></a> can be used for one-off
 matching.</p>
 <div class="refsect3">
-<a name="id-1.4.3.4.6.5"></a><h4>Syntax of the JSONPath expressions</h4>
+<a name="id-1.4.3.4.7.5"></a><h4>Syntax of the JSONPath expressions</h4>
 <p>A JSONPath expression is composed by path indices and operators.
 Each path index can either be a member name or an element index inside
 a JSON tree. A JSONPath expression must start with the '$' operator; each
@@ -182,7 +187,7 @@ of the store object.</p></li>
 <a class="ulink" href="http://goessner.net/articles/JsonPath/" target="_top">JSONPath website</a>.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.4.3.4.6.6"></a><h4>Example of JSONPath matches</h4>
+<a name="id-1.4.3.4.7.6"></a><h4>Example of JSONPath matches</h4>
 <p>The following example shows some of the results of using <a class="link" href="JsonPath.html" title="JsonPath"><span class="type">JsonPath</span></a>
 on a JSON tree. We use the following JSON description of a bookstore:</p>
 <div class="informalexample">
@@ -235,7 +240,7 @@ on a JSON tree. We use the following JSON description of a bookstore:</p>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
         <td class="listing_code"><pre class="programlisting"><span class="usertype">JsonParser</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">parser </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonParser.html#json-parser-new">json_parser_new</a></span><span class="normal"> </span><span class="symbol">();</span>
-<span class="function"><a href="JsonParser.html#json-parser-load-from-data">json_parser_load_from_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">parser</span><span class="symbol">,</span><span class="normal"> json_data</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">1</span><span class="symbol">,</span><span class="normal"> NULL</span><span class="symbol">);</span></pre></td>
+<span class="function"><a href="JsonParser.html#json-parser-load-from-data">json_parser_load_from_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">parser</span><span class="symbol">,</span><span class="normal"> json_data</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">1</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -253,7 +258,7 @@ on a JSON tree. We use the following JSON description of a bookstore:</p>
 4</pre></td>
         <td class="listing_code"><pre class="programlisting"><span class="usertype">JsonNode</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">result</span><span class="symbol">;</span>
 <span class="usertype">JsonPath</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">path </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonPath.html#json-path-new">json_path_new</a></span><span class="normal"> </span><span class="symbol">();</span>
-<span class="function"><a href="JsonPath.html#json-path-compile">json_path_compile</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">path</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"$.store..author"</span><span class="symbol">,</span><span class="normal"> NULL</span><span class="symbol">);</span>
+<span class="function"><a href="JsonPath.html#json-path-compile">json_path_compile</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">path</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"$.store..author"</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
 <span class="normal">result </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonPath.html#json-path-match">json_path_match</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">path</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="JsonParser.html#json-parser-get-root">json_parser_get_root</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">parser</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
@@ -274,8 +279,8 @@ author member of the objects in the JSON tree. If we use a
 4</pre></td>
         <td class="listing_code"><pre class="programlisting"><span class="usertype">JsonGenerator</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">generator </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonGenerator.html#json-generator-new">json_generator_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="function"><a href="JsonGenerator.html#json-generator-set-root">json_generator_set_root</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">generator</span><span class="symbol">,</span><span class="normal"> result</span><span class="symbol">);</span>
-<span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">str </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonGenerator.html#json-generator-to-data">json_generator_to_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">generator</span><span class="symbol">,</span><span class="normal"> NULL</span><span class="symbol">);</span>
-<span class="function">g_print</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Results: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> str</span><span class="symbol">);</span></pre></td>
+<span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">str </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonGenerator.html#json-generator-to-data">json_generator_to_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">generator</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
+<span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Results: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> str</span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -310,7 +315,7 @@ and <a class="link" href="JsonPath.html#json-path-match" title="json_path_match
 <div class="refsect3">
 <a name="json-path-new.returns"></a><h4>Returns</h4>
 <p> the newly created <a class="link" href="JsonPath.html" title="JsonPath"><span class="type">JsonPath</span></a> instance. Use
-<code class="function">g_object_unref()</code> to free the allocated resources when done. </p>
+<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a> to free the allocated resources when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
@@ -318,10 +323,10 @@ and <a class="link" href="JsonPath.html#json-path-match" title="json_path_match
 <hr>
 <div class="refsect2">
 <a name="json-path-compile"></a><h3>json_path_compile ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_path_compile (<em class="parameter"><code><a class="link" href="JsonPath.html" title="JsonPath"><span class="type">JsonPath</span></a> *path</code></em>,
                    <em class="parameter"><code>const <span class="type">char</span> *expression</code></em>,
-                   <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Validates and decomposes <em class="parameter"><code>expression</code></em>
 .</p>
 <p>A JSONPath expression must be compiled before calling <a class="link" href="JsonPath.html#json-path-match" title="json_path_match ()"><code class="function">json_path_match()</code></a>.</p>
@@ -346,7 +351,7 @@ json_path_compile (<em class="parameter"><code><a class="link" href="JsonPath.ht
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -354,10 +359,10 @@ json_path_compile (<em class="parameter"><code><a class="link" href="JsonPath.ht
 </div>
 <div class="refsect3">
 <a name="json-path-compile.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> on success; on error, <em class="parameter"><code>error</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success; on error, <em class="parameter"><code>error</code></em>
 will be set with
 the <a class="link" href="JsonPath.html#JSON-PATH-ERROR:CAPS" title="JSON_PATH_ERROR"><code class="literal">JSON_PATH_ERROR</code></a> domain and a code from the <a class="link" href="JsonPath.html#JsonPathError" title="enum JsonPathError"><span class="type">JsonPathError</span></a>
-enumeration, and <code class="literal">FALSE</code> will be returned</p>
+enumeration, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> will be returned</p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
 </div>
@@ -409,7 +414,7 @@ Use <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_path_query (<em class="parameter"><code>const <span class="type">char</span> *expression</code></em>,
                  <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *root</code></em>,
-                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Queries a JSON tree using a JSONPath expression.</p>
 <p>This function is a simple wrapper around <a class="link" href="JsonPath.html#json-path-new" title="json_path_new ()"><code class="function">json_path_new()</code></a>,
 <a class="link" href="JsonPath.html#json-path-compile" title="json_path_compile ()"><code class="function">json_path_compile()</code></a> and <a class="link" href="JsonPath.html#json-path-match" title="json_path_match ()"><code class="function">json_path_match()</code></a>. It implicitly
@@ -438,7 +443,7 @@ matches it against the JSON tree pointed by <em class="parameter"><code>root</co
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -505,6 +510,6 @@ cannot be directly accessed.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 85%
rename from doc/reference/html/JsonReader.html
rename to doc/html/JsonReader.html
index 20bada7..cbcaf26 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Parser">
 <link rel="prev" href="JsonParser.html" title="JsonParser">
 <link rel="next" href="JsonPath.html" title="JsonPath">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -59,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-read-element" title="json_reader_read_element ()">json_reader_read_element</a> <span class="c_punctuation">()</span>
@@ -75,7 +75,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-is-array" title="json_reader_is_array ()">json_reader_is_array</a> <span class="c_punctuation">()</span>
@@ -83,7 +83,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-count-elements" title="json_reader_count_elements ()">json_reader_count_elements</a> <span class="c_punctuation">()</span>
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-read-member" title="json_reader_read_member ()">json_reader_read_member</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-is-object" title="json_reader_is_object ()">json_reader_is_object</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-count-members" title="json_reader_count_members ()">json_reader_count_members</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gchar</span> **
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-list-members" title="json_reader_list_members ()">json_reader_list_members</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">gchar</span> *
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-get-member-name" title="json_reader_get_member_name ()">json_reader_get_member_name</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-is-value" title="json_reader_is_value ()">json_reader_is_value</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gint64</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-get-int-value" title="json_reader_get_int_value ()">json_reader_get_int_value</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gdouble</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-get-double-value" title="json_reader_get_double_value ()">json_reader_get_double_value</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">gchar</span> *
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-get-string-value" title="json_reader_get_string_value ()">json_reader_get_string_value</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-get-boolean-value" title="json_reader_get_boolean_value ()">json_reader_get_boolean_value</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-get-null-value" title="json_reader_get_null_value ()">json_reader_get_null_value</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">GError</span> *
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="returnvalue">GError</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="JsonReader.html#json-reader-get-error" title="json_reader_get_error ()">json_reader_get_error</a> <span class="c_punctuation">()</span>
 </div>
 <div class="refsect1">
 <a name="JsonReader.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GObject
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> JsonReader
 </pre>
 </div>
 <div class="refsect1">
+<a name="JsonReader.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="JsonReader.description"></a><h2>Description</h2>
 <p><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> provides a simple, cursor-based API for parsing a JSON DOM. It
 is similar, in spirit, to the XML Reader API.</p>
@@ -305,7 +310,7 @@ called, e.g.:</p>
 <span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function"><a href="JsonReader.html#json-reader-read-element">json_reader_read_element</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">,</span><span class="normal"> </span><span class="number">6</span><span class="symbol">))</span>
 <span class="normal">  </span><span class="cbracket">{</span>
 <span class="normal">    </span><span class="keyword">const</span><span class="normal"> </span><span class="usertype">GError</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">error </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonReader.html#json-reader-get-error">json_reader_get_error</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="function">g_print</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Unable to read the element: %s"</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">-&gt;</span><span class="normal">message</span><span class="symbol">);</span>
+<span class="normal">    </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Unable to read the element: %s"</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">-&gt;</span><span class="normal">message</span><span class="symbol">);</span>
 <span class="normal">  </span><span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
@@ -334,14 +339,14 @@ the JSON tree starting from <em class="parameter"><code>node</code></em>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>node</p></td>
-<td class="parameter_description"><p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
 <a name="json-reader-new.returns"></a><h4>Returns</h4>
-<p> the newly created <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a>. Use <code class="function">g_object_unref()</code> to
+<p> the newly created <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a>. Use <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a> to
 release the allocated resources when done</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
@@ -385,9 +390,9 @@ a copy of <em class="parameter"><code>root</code></em>
 <hr>
 <div class="refsect2">
 <a name="json-reader-read-element"></a><h3>json_reader_read_element ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_reader_read_element (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>,
-                          <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Advances the cursor of <em class="parameter"><code>reader</code></em>
  to the element <em class="parameter"><code>index_</code></em>
  of the array
@@ -457,8 +462,8 @@ code paths:</p>
         <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function"><a href="JsonReader.html#json-reader-read-element">json_reader_read_element</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">))</span>
 <span class="normal">  </span><span class="cbracket">{</span>
 <span class="normal">    </span><span class="function"><a href="JsonReader.html#json-reader-end-element">json_reader_end_element</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="function">g_set_error</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">,</span><span class="normal"> …</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="keyword">return</span><span class="normal"> FALSE</span><span class="symbol">;</span>
+<span class="normal">    </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#g-set-error">g_set_error</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">,</span><span class="normal"> …</span><span class="symbol">);</span>
+<span class="normal">    </span><span class="keyword">return</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS">FALSE</a></span><span class="symbol">;</span>
 <span class="normal">  </span><span class="cbracket">}</span>
 
 <span class="normal">str_value </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonReader.html#json-reader-get-string-value">json_reader_get_string_value</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">);</span>
@@ -493,7 +498,7 @@ code paths:</p>
 </div>
 <div class="refsect3">
 <a name="json-reader-read-element.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> on success, and <code class="literal">FALSE</code> otherwise</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
 </div>
@@ -526,7 +531,7 @@ inside an array</p>
 <hr>
 <div class="refsect2">
 <a name="json-reader-is-array"></a><h3>json_reader_is_array ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_reader_is_array (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Checks whether the <em class="parameter"><code>reader</code></em>
  is currently on an array</p>
@@ -547,7 +552,7 @@ json_reader_is_array (<em class="parameter"><code><a class="link" href="JsonRead
 </div>
 <div class="refsect3">
 <a name="json-reader-is-array.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> is on an array, and <code class="literal">FALSE</code>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> is on an array, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
 otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
@@ -555,7 +560,7 @@ otherwise</p>
 <hr>
 <div class="refsect2">
 <a name="json-reader-count-elements"></a><h3>json_reader_count_elements ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
 json_reader_count_elements (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Counts the elements of the current position, if <em class="parameter"><code>reader</code></em>
  is
@@ -585,9 +590,9 @@ the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type"
 <hr>
 <div class="refsect2">
 <a name="json-reader-read-member"></a><h3>json_reader_read_member ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_reader_read_member (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>,
-                         <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                         <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Advances the cursor of <em class="parameter"><code>reader</code></em>
  to the <em class="parameter"><code>member_name</code></em>
  of the object at the
@@ -656,8 +661,8 @@ defined in the object, the <a class="link" href="JsonReader.html" title="JsonRea
         <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function"><a href="JsonReader.html#json-reader-read-member">json_reader_read_member</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"title"</span><span class="symbol">))</span>
 <span class="normal">  </span><span class="cbracket">{</span>
 <span class="normal">    </span><span class="function"><a href="JsonReader.html#json-reader-end-member">json_reader_end_member</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="function">g_set_error</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">,</span><span class="normal"> …</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="keyword">return</span><span class="normal"> FALSE</span><span class="symbol">;</span>
+<span class="normal">    </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#g-set-error">g_set_error</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">,</span><span class="normal"> …</span><span class="symbol">);</span>
+<span class="normal">    </span><span class="keyword">return</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS">FALSE</a></span><span class="symbol">;</span>
 <span class="normal">  </span><span class="cbracket">}</span>
 
 <span class="normal">str_value </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="JsonReader.html#json-reader-get-string-value">json_reader_get_string_value</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">reader</span><span class="symbol">);</span>
@@ -692,7 +697,7 @@ defined in the object, the <a class="link" href="JsonReader.html" title="JsonRea
 </div>
 <div class="refsect3">
 <a name="json-reader-read-member.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> on success, and <code class="literal">FALSE</code> otherwise</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
 </div>
@@ -725,7 +730,7 @@ inside an object</p>
 <hr>
 <div class="refsect2">
 <a name="json-reader-is-object"></a><h3>json_reader_is_object ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_reader_is_object (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Checks whether the <em class="parameter"><code>reader</code></em>
  is currently on an object</p>
@@ -746,7 +751,7 @@ json_reader_is_object (<em class="parameter"><code><a class="link" href="JsonRea
 </div>
 <div class="refsect3">
 <a name="json-reader-is-object.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> is on an object, and <code class="literal">FALSE</code>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> is on an object, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
 otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
@@ -754,7 +759,7 @@ otherwise</p>
 <hr>
 <div class="refsect2">
 <a name="json-reader-count-members"></a><h3>json_reader_count_members ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
 json_reader_count_members (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Counts the members of the current position, if <em class="parameter"><code>reader</code></em>
  is
@@ -784,7 +789,7 @@ the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type"
 <hr>
 <div class="refsect2">
 <a name="json-reader-list-members"></a><h3>json_reader_list_members ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> **
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
 json_reader_list_members (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Retrieves a list of member names from the current position, if <em class="parameter"><code>reader</code></em>
 
@@ -806,8 +811,8 @@ is positioned on an object.</p>
 </div>
 <div class="refsect3">
 <a name="json-reader-list-members.returns"></a><h4>Returns</h4>
-<p> a newly allocated, <code class="literal">NULL</code>-terminated
-array of strings holding the members name. Use <code class="function">g_strfreev()</code> when
+<p> a newly allocated, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated
+array of strings holding the members name. Use <a href="https://developer.gnome.org/glib/unstable/glib-String-Utility-Functions.html#g-strfreev"><code class="function">g_strfreev()</code></a> when
 done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -816,7 +821,7 @@ done. </p>
 <hr>
 <div class="refsect2">
 <a name="json-reader-get-member-name"></a><h3>json_reader_get_member_name ()</h3>
-<pre class="programlisting">const <span class="returnvalue">gchar</span> *
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_reader_get_member_name (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Retrieves the name of the current member.</p>
 <div class="refsect3">
@@ -836,7 +841,7 @@ json_reader_get_member_name (<em class="parameter"><code><a class="link" href="J
 </div>
 <div class="refsect3">
 <a name="json-reader-get-member-name.returns"></a><h4>Returns</h4>
-<p> the name of the member, or <code class="literal">NULL</code>. </p>
+<p> the name of the member, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
@@ -844,7 +849,7 @@ json_reader_get_member_name (<em class="parameter"><code><a class="link" href="J
 <hr>
 <div class="refsect2">
 <a name="json-reader-is-value"></a><h3>json_reader_is_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_reader_is_value (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Checks whether the <em class="parameter"><code>reader</code></em>
  is currently on a value</p>
@@ -865,7 +870,7 @@ json_reader_is_value (<em class="parameter"><code><a class="link" href="JsonRead
 </div>
 <div class="refsect3">
 <a name="json-reader-is-value.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> is on a value, and <code class="literal">FALSE</code>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> is on a value, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
 otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
@@ -894,7 +899,7 @@ json_reader_get_value (<em class="parameter"><code><a class="link" href="JsonRea
 </div>
 <div class="refsect3">
 <a name="json-reader-get-value.returns"></a><h4>Returns</h4>
-<p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <code class="literal">NULL</code>. The returned node
+<p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. The returned node
 is owned by the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> and it should not be modified or freed
 directly. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -904,7 +909,7 @@ directly. </p>
 <hr>
 <div class="refsect2">
 <a name="json-reader-get-int-value"></a><h3>json_reader_get_int_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 json_reader_get_int_value (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Retrieves the integer value of the current position of <em class="parameter"><code>reader</code></em>
 </p>
@@ -932,7 +937,7 @@ json_reader_get_int_value (<em class="parameter"><code><a class="link" href="Jso
 <hr>
 <div class="refsect2">
 <a name="json-reader-get-double-value"></a><h3>json_reader_get_double_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">gdouble</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 json_reader_get_double_value (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Retrieves the floating point value of the current position of <em class="parameter"><code>reader</code></em>
 </p>
@@ -960,7 +965,7 @@ json_reader_get_double_value (<em class="parameter"><code><a class="link" href="
 <hr>
 <div class="refsect2">
 <a name="json-reader-get-string-value"></a><h3>json_reader_get_string_value ()</h3>
-<pre class="programlisting">const <span class="returnvalue">gchar</span> *
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_reader_get_string_value (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Retrieves the string value of the current position of <em class="parameter"><code>reader</code></em>
 </p>
@@ -988,7 +993,7 @@ json_reader_get_string_value (<em class="parameter"><code><a class="link" href="
 <hr>
 <div class="refsect2">
 <a name="json-reader-get-boolean-value"></a><h3>json_reader_get_boolean_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_reader_get_boolean_value (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Retrieves the boolean value of the current position of <em class="parameter"><code>reader</code></em>
 </p>
@@ -1016,7 +1021,7 @@ json_reader_get_boolean_value (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="json-reader-get-null-value"></a><h3>json_reader_get_null_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_reader_get_null_value (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
 <p>Checks whether the value of the current position of <em class="parameter"><code>reader</code></em>
  is 'null'</p>
@@ -1037,16 +1042,16 @@ json_reader_get_null_value (<em class="parameter"><code><a class="link" href="Js
 </div>
 <div class="refsect3">
 <a name="json-reader-get-null-value.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if 'null' is set, and <code class="literal">FALSE</code> otherwise</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if 'null' is set, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-reader-get-error"></a><h3>json_reader_get_error ()</h3>
-<pre class="programlisting">const <span class="returnvalue">GError</span> *
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="returnvalue">GError</span></a> *
 json_reader_get_error (<em class="parameter"><code><a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> *reader</code></em>);</pre>
-<p>Retrieves the <span class="type">GError</span> currently set on <em class="parameter"><code>reader</code></em>
+<p>Retrieves the <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> currently set on <em class="parameter"><code>reader</code></em>
 , if the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a>
 is in error state</p>
 <div class="refsect3">
@@ -1066,7 +1071,7 @@ is in error state</p>
 </div>
 <div class="refsect3">
 <a name="json-reader-get-error.returns"></a><h4>Returns</h4>
-<p> the pointer to the error, or <code class="literal">NULL</code>. </p>
+<p> the pointer to the error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix07.html#api-index-0.12">0.12</a></p>
@@ -1180,6 +1185,6 @@ be accessed using the provided API</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 98%
rename from doc/reference/html/annotation-glossary.html
rename to doc/html/annotation-glossary.html
index bc96151..ae3edd9 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix11.html" title="Index of new symbols in 1.2">
 <link rel="next" href="license.html" title="Appendix A. License">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -75,6 +75,6 @@
 <dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 95%
rename from doc/reference/html/ch01.html
rename to doc/html/ch01.html
index 6ce0229..8a39aae 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="json-base.html" title="Part II. JSON-GLib Reference">
 <link rel="prev" href="json-base.html" title="Part II. JSON-GLib Reference">
 <link rel="next" href="json-glib-JSON-Node.html" title="JSON Node">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,6 +35,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 94%
rename from doc/reference/html/ch02.html
rename to doc/html/ch02.html
index 1196301..021cd0a 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="json-streams.html" title="Part III. Reading and writing">
 <link rel="prev" href="json-streams.html" title="Part III. Reading and writing">
 <link rel="next" href="JsonParser.html" title="JsonParser">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,6 +35,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 94%
rename from doc/reference/html/ch03.html
rename to doc/html/ch03.html
index 7fe9c71..f6c66a0 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="json-streams.html" title="Part III. Reading and writing">
 <link rel="prev" href="JsonPath.html" title="JsonPath">
 <link rel="next" href="JsonGenerator.html" title="JsonGenerator">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,6 +32,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 94%
rename from doc/reference/html/ch04.html
rename to doc/html/ch04.html
index af44f8a..a7832f1 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="json-streams.html" title="Part III. Reading and writing">
 <link rel="prev" href="JsonBuilder.html" title="JsonBuilder">
 <link rel="next" href="json-glib-Utility-API.html" title="Utility API">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,6 +27,6 @@
 </dt></dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 86%
rename from doc/reference/html/ch06.html
rename to doc/html/ch06.html
index 8b3ad8d..60a3437 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
 <link rel="prev" href="json-validate-tool.html" title="json-glib-validate">
 <link rel="next" href="ix01.html" title="Index">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="id-1.6.3"></a>Object Hierarchy</h2></div></div></div>
 <pre class="screen">
-    GObject
+    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">├──</span> <a class="link" href="JsonBuilder.html" title="JsonBuilder">JsonBuilder</a>
     <span class="lineart">├──</span> <a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a>
     <span class="lineart">├──</span> <a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a>
     <span class="lineart">├──</span> <a class="link" href="JsonPath.html" title="JsonPath">JsonPath</a>
     <span class="lineart">╰──</span> <a class="link" href="JsonReader.html" title="JsonReader">JsonReader</a>
-    <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
+    <a href="https://developer.gnome.org/gobject/unstable/GTypeModule.html">GInterface</a>
     <span class="lineart">╰──</span> <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable">JsonSerializable</a>
-    <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+    <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html">GBoxed</a>
     <span class="lineart">├──</span> <a class="link" href="json-glib-JSON-Array.html#JsonArray">JsonArray</a>
     <span class="lineart">├──</span> <a class="link" href="json-glib-JSON-Node.html#JsonNode">JsonNode</a>
     <span class="lineart">╰──</span> <a class="link" href="json-glib-JSON-Object.html#JsonObject">JsonObject</a>
 </pre>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 88%
rename from doc/reference/html/index.html
rename to doc/html/index.html
index 55de4fd..e5c5e6f 100644 (file)
@@ -5,8 +5,8 @@
 <title>JSON-GLib Reference Manual: JSON-GLib Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="JSON-GLib Reference Manual">
-<link rel="next" href="json-glib.html" title="Part I. JSON-GLib Overview">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<link rel="next" href="json-overview.html" title="Part I. JSON-GLib Overview">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">JSON-GLib Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for JSON-GLib 1.2.6</p></div>
+<div>
+<p class="releaseinfo">
+      </p>
+<p>This document is the API reference for for JSON-GLib 1.2.8.</p>
+<p class="releaseinfo">
+      </p>
+<p>
+        The latest version of this API reference is also available
+        <a class="ulink" href="https://developer.gnome.org/json-glib/" target="_top">online</a>.
+      </p>
+<p class="releaseinfo">
+      </p>
+<p>
+        If you find any issues in this API reference, please report it
+        using <a class="ulink" href="http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib" target="_top">the online
+        bug reporting tool</a> at bugzilla.gnome.org.
+      </p>
+<p class="releaseinfo">
+    </p>
+</div>
 <div><p class="copyright">Copyright © 2007, 2008 OpenedHand LTD</p></div>
 <div><p class="copyright">Copyright © 2009, 2010, 2011 Intel Corporation</p></div>
 <div><div class="legalnotice">
@@ -43,7 +62,7 @@
 <hr>
 </div>
 <div class="toc"><dl class="toc">
-<dt><span class="part"><a href="json-glib.html">I. JSON-GLib Overview</a></span></dt>
+<dt><span class="part"><a href="json-overview.html">I. JSON-GLib Overview</a></span></dt>
 <dt><span class="part"><a href="json-base.html">II. JSON-GLib Reference</a></span></dt>
 <dd><dl>
 <dt><span class="chapter"><a href="ch01.html">Data Types</a></span></dt>
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 99%
rename from doc/reference/html/ix01.html
rename to doc/html/ix01.html
index eb3deb1..4d21284 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ch06.html" title="Object Hierarchy">
 <link rel="next" href="ix02.html" title="Index of deprecated symbols">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 96%
rename from doc/reference/html/ix02.html
rename to doc/html/ix02.html
index 4c929ca..5e6ca62 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix01.html" title="Index">
 <link rel="next" href="ix03.html" title="Index of new symbols in 0.4">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -43,6 +43,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 96%
rename from doc/reference/html/ix03.html
rename to doc/html/ix03.html
index 65b6482..5bf274d 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix02.html" title="Index of deprecated symbols">
 <link rel="next" href="ix04.html" title="Index of new symbols in 0.6">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -50,6 +50,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 96%
rename from doc/reference/html/ix04.html
rename to doc/html/ix04.html
index d9bbcf4..9343959 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix03.html" title="Index of new symbols in 0.4">
 <link rel="next" href="ix05.html" title="Index of new symbols in 0.8">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -43,6 +43,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 99%
rename from doc/reference/html/ix05.html
rename to doc/html/ix05.html
index 6c05c69..c251935 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix04.html" title="Index of new symbols in 0.6">
 <link rel="next" href="ix06.html" title="Index of new symbols in 0.10">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 98%
rename from doc/reference/html/ix06.html
rename to doc/html/ix06.html
index cc7bcf3..c191105 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix05.html" title="Index of new symbols in 0.8">
 <link rel="next" href="ix07.html" title="Index of new symbols in 0.12">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 98%
rename from doc/reference/html/ix07.html
rename to doc/html/ix07.html
index 35753c2..70240d7 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix06.html" title="Index of new symbols in 0.10">
 <link rel="next" href="ix08.html" title="Index of new symbols in 0.14">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 98%
rename from doc/reference/html/ix08.html
rename to doc/html/ix08.html
index 01be230..e698532 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix07.html" title="Index of new symbols in 0.12">
 <link rel="next" href="ix09.html" title="Index of new symbols in 0.16">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 97%
rename from doc/reference/html/ix09.html
rename to doc/html/ix09.html
index f8df76c..91c8502 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix08.html" title="Index of new symbols in 0.14">
 <link rel="next" href="ix10.html" title="Index of new symbols in 1.0">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -61,6 +61,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 95%
rename from doc/reference/html/ix10.html
rename to doc/html/ix10.html
index 0deb7de..bbbfc27 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix09.html" title="Index of new symbols in 0.16">
 <link rel="next" href="ix11.html" title="Index of new symbols in 1.2">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -33,6 +33,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 98%
rename from doc/reference/html/ix11.html
rename to doc/html/ix11.html
index 1d43c69..da8c0c9 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="ix10.html" title="Index of new symbols in 1.0">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 96%
rename from doc/reference/html/json-advanced.html
rename to doc/html/json-advanced.html
index a150e6b..4a6890d 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="json-glib-Utility-API.html" title="Utility API">
 <link rel="next" href="json-glib-GObject-Serialization.html" title="GObject Serialization">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -44,6 +44,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 88%
rename from doc/reference/html/json-base.html
rename to doc/html/json-base.html
index 520409c..70454a7 100644 (file)
@@ -6,9 +6,9 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
-<link rel="prev" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="prev" href="json-overview.html" title="Part I. JSON-GLib Overview">
 <link rel="next" href="ch01.html" title="Data Types">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="json-glib.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="json-overview.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="ch01.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part">
@@ -55,6 +55,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 97%
rename from doc/reference/html/json-format-tool.html
rename to doc/html/json-format-tool.html
index df3f9e3..f8cf6bf 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="tools.html" title="JSON-GLib Tools">
 <link rel="prev" href="tools.html" title="JSON-GLib Tools">
 <link rel="next" href="json-validate-tool.html" title="json-glib-validate">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -78,6 +78,6 @@ This argument is only considered if <code class="option">--prettify</code> is us
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
@@ -8,7 +8,7 @@
 <link rel="up" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="prev" href="json-glib-Serializable-Interface.html" title="Serializable Interface">
 <link rel="next" href="json-glib-JSON-GVariant-Integration.html" title="JSON GVariant Integration">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -49,7 +49,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gpointer</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a>
 </td>
 <td class="function_name">
 <span class="c_punctuation">(</span><a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()">*JsonBoxedDeserializeFunc</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-serialize" title="json_boxed_can_serialize ()">json_boxed_can_serialize</a> <span class="c_punctuation">()</span>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-deserialize" title="json_boxed_can_deserialize ()">json_boxed_can_deserialize</a> <span class="c_punctuation">()</span>
@@ -97,7 +97,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gpointer</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize" title="json_boxed_deserialize ()">json_boxed_deserialize</a> <span class="c_punctuation">()</span>
 </table></div>
 </div>
 <div class="refsect1">
+<a name="json-glib-Boxed-Types-Serialization.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-Boxed-Types-Serialization.description"></a><h2>Description</h2>
-<p>GLib's <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type is a generic wrapper for arbitrary C structures.</p>
-<p>JSON-GLib allows serialization and deserialization of a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type
+<p>GLib's <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type is a generic wrapper for arbitrary C structures.</p>
+<p>JSON-GLib allows serialization and deserialization of a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type
 by registering functions mapping a <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> to a specific
-<span class="type">GType</span>.</p>
-<p>When registering a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type you should also register the
+<a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.</p>
+<p>When registering a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type you should also register the
 corresponding transformation functions, e.g.:</p>
 <div class="informalexample">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
@@ -138,7 +143,7 @@ corresponding transformation functions, e.g.:</p>
 18
 19
 20</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="normal">GType</span>
+        <td class="listing_code"><pre class="programlisting"><span class="normal"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType">GType</a></span>
 <span class="function">my_struct_get_type</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="symbol">)</span>
 <span class="cbracket">{</span>
 <span class="normal">  </span><span class="keyword">static</span><span class="normal"> </span><span class="usertype">GType</span><span class="normal"> boxed_type </span><span class="symbol">=</span><span class="normal"> </span><span class="number">0</span><span class="symbol">;</span>
@@ -146,9 +151,9 @@ corresponding transformation functions, e.g.:</p>
 <span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">boxed_type </span><span class="symbol">==</span><span class="normal"> </span><span class="number">0</span><span class="symbol">)</span>
 <span class="normal">    </span><span class="cbracket">{</span>
 <span class="normal">      boxed_type </span><span class="symbol">=</span>
-<span class="normal">        </span><span class="function">g_boxed_type_register_static</span><span class="normal"> </span><span class="symbol">(</span><span class="function">g_intern_static_string</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"MyStruct"</span><span class="symbol">),</span>
-<span class="normal">                                      </span><span class="symbol">(</span><span class="normal">GBoxedCopyFunc</span><span class="symbol">)</span><span class="normal"> my_struct_copy</span><span class="symbol">,</span>
-<span class="normal">                                      </span><span class="symbol">(</span><span class="normal">GBoxedFreeFunc</span><span class="symbol">)</span><span class="normal"> my_struct_free</span><span class="symbol">);</span>
+<span class="normal">        </span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html#g-boxed-type-register-static">g_boxed_type_register_static</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#g-intern-static-string">g_intern_static_string</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"MyStruct"</span><span class="symbol">),</span>
+<span class="normal">                                      </span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html#GBoxedCopyFunc">GBoxedCopyFunc</a></span><span class="symbol">)</span><span class="normal"> my_struct_copy</span><span class="symbol">,</span>
+<span class="normal">                                      </span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html#GBoxedFreeFunc">GBoxedFreeFunc</a></span><span class="symbol">)</span><span class="normal"> my_struct_free</span><span class="symbol">);</span>
 
 <span class="normal">      </span><span class="function"><a href="json-glib-Boxed-Types-Serialization.html#json-boxed-register-serialize-func">json_boxed_register_serialize_func</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">boxed_type</span><span class="symbol">,</span><span class="normal"> <a href="json-glib-JSON-Node.html#JSON-NODE-OBJECT:CAPS">JSON_NODE_OBJECT</a></span><span class="symbol">,</span>
 <span class="normal">                                          my_struct_serialize</span><span class="symbol">);</span>
@@ -169,8 +174,8 @@ it will be passed a pointer to the C structure and it must return a
 <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. The deserialization function will be invoked by
 <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize" title="json_boxed_deserialize ()"><code class="function">json_boxed_deserialize()</code></a>: it will be passed a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> for the
 declared type and it must return a newly allocated C structure.</p>
-<p>It is possible to check whether a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type can be deserialized
-from a specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a>, and whether a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> can be serialized
+<p>It is possible to check whether a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> type can be deserialized
+from a specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a>, and whether a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> can be serialized
 and to which specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a>.</p>
 </div>
 <div class="refsect1">
@@ -178,8 +183,8 @@ and to which specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeTyp
 <div class="refsect2">
 <a name="JsonBoxedSerializeFunc"></a><h3>JsonBoxedSerializeFunc ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
-<span class="c_punctuation">(</span>*JsonBoxedSerializeFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">gconstpointer</span> boxed</code></em>);</pre>
-<p>Serializes the passed <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> and stores it inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a></p>
+<span class="c_punctuation">(</span>*JsonBoxedSerializeFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> boxed</code></em>);</pre>
+<p>Serializes the passed <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> and stores it inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a></p>
 <div class="refsect3">
 <a name="JsonBoxedSerializeFunc.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -190,7 +195,7 @@ and to which specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeTyp
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>boxed</p></td>
-<td class="parameter_description"><p>a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -204,9 +209,9 @@ and to which specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeTyp
 <hr>
 <div class="refsect2">
 <a name="JsonBoxedDeserializeFunc"></a><h3>JsonBoxedDeserializeFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">gpointer</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a>
 <span class="c_punctuation">(</span>*JsonBoxedDeserializeFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
-<p>Deserializes the contents of the passed <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> into a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a></p>
+<p>Deserializes the contents of the passed <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> into a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a></p>
 <div class="refsect3">
 <a name="JsonBoxedDeserializeFunc.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -232,10 +237,10 @@ and to which specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeTyp
 <div class="refsect2">
 <a name="json-boxed-register-serialize-func"></a><h3>json_boxed_register_serialize_func ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-json_boxed_register_serialize_func (<em class="parameter"><code><span class="type">GType</span> gboxed_type</code></em>,
+json_boxed_register_serialize_func (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gboxed_type</code></em>,
                                     <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> node_type</code></em>,
                                     <em class="parameter"><code><a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc" title="JsonBoxedSerializeFunc ()"><span class="type">JsonBoxedSerializeFunc</span></a> serialize_func</code></em>);</pre>
-<p>Registers a serialization function for a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
+<p>Registers a serialization function for a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
 
 to a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> of type <em class="parameter"><code>node_type</code></em>
 </p>
@@ -276,10 +281,10 @@ a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">Js
 <div class="refsect2">
 <a name="json-boxed-register-deserialize-func"></a><h3>json_boxed_register_deserialize_func ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-json_boxed_register_deserialize_func (<em class="parameter"><code><span class="type">GType</span> gboxed_type</code></em>,
+json_boxed_register_deserialize_func (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gboxed_type</code></em>,
                                       <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> node_type</code></em>,
                                       <em class="parameter"><code><a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()"><span class="type">JsonBoxedDeserializeFunc</span></a> deserialize_func</code></em>);</pre>
-<p>Registers a deserialization function for a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
+<p>Registers a deserialization function for a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
 
 from a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> of type <em class="parameter"><code>node_type</code></em>
 </p>
@@ -319,15 +324,15 @@ a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">Js
 <hr>
 <div class="refsect2">
 <a name="json-boxed-can-serialize"></a><h3>json_boxed_can_serialize ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
-json_boxed_can_serialize (<em class="parameter"><code><span class="type">GType</span> gboxed_type</code></em>,
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+json_boxed_can_serialize (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gboxed_type</code></em>,
                           <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> *node_type</code></em>);</pre>
-<p>Checks whether it is possible to serialize a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of
+<p>Checks whether it is possible to serialize a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of
 type <em class="parameter"><code>gboxed_type</code></em>
  into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. The type of the
 <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> is placed inside <em class="parameter"><code>node_type</code></em>
  if the function
-returns <code class="literal">TRUE</code> and it's undefined otherwise.</p>
+returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> and it's undefined otherwise.</p>
 <div class="refsect3">
 <a name="json-boxed-can-serialize.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -353,18 +358,18 @@ serialized into. </p></td>
 </div>
 <div class="refsect3">
 <a name="json-boxed-can-serialize.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the type can be serialized,
-and <code class="literal">FALSE</code> otherwise.</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the type can be serialized,
+and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
 </div>
 <p class="since">Since: <a class="link" href="ix06.html#api-index-0.10">0.10</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-boxed-can-deserialize"></a><h3>json_boxed_can_deserialize ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
-json_boxed_can_deserialize (<em class="parameter"><code><span class="type">GType</span> gboxed_type</code></em>,
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+json_boxed_can_deserialize (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gboxed_type</code></em>,
                             <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> node_type</code></em>);</pre>
-<p>Checks whether it is possible to deserialize a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of
+<p>Checks whether it is possible to deserialize a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of
 type <em class="parameter"><code>gboxed_type</code></em>
  from a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> of type <em class="parameter"><code>node_type</code></em>
 </p>
@@ -392,7 +397,7 @@ type <em class="parameter"><code>gboxed_type</code></em>
 </div>
 <div class="refsect3">
 <a name="json-boxed-can-deserialize.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the type can be deserialized, <code class="literal">FALSE</code> otherwise</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the type can be deserialized, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix06.html#api-index-0.10">0.10</a></p>
 </div>
@@ -400,10 +405,10 @@ type <em class="parameter"><code>gboxed_type</code></em>
 <div class="refsect2">
 <a name="json-boxed-serialize"></a><h3>json_boxed_serialize ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
-json_boxed_serialize (<em class="parameter"><code><span class="type">GType</span> gboxed_type</code></em>,
-                      <em class="parameter"><code><span class="type">gconstpointer</span> boxed</code></em>);</pre>
+json_boxed_serialize (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gboxed_type</code></em>,
+                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> boxed</code></em>);</pre>
 <p>Serializes <em class="parameter"><code>boxed</code></em>
-, a pointer to a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
+, a pointer to a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
 ,
 into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a></p>
 <div class="refsect3">
@@ -422,7 +427,7 @@ into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="typ
 </tr>
 <tr>
 <td class="parameter_name"><p>boxed</p></td>
-<td class="parameter_description"><p>a pointer to a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
+<td class="parameter_description"><p>a pointer to a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of type <em class="parameter"><code>gboxed_type</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -432,7 +437,7 @@ into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="typ
 <div class="refsect3">
 <a name="json-boxed-serialize.returns"></a><h4>Returns</h4>
 <p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> with the serialization of the
-boxed type, or <code class="literal">NULL</code> if serialization either failed or was not possible. </p>
+boxed type, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if serialization either failed or was not possible. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix06.html#api-index-0.10">0.10</a></p>
@@ -440,11 +445,11 @@ boxed type, or <code class="literal">NULL</code> if serialization either failed
 <hr>
 <div class="refsect2">
 <a name="json-boxed-deserialize"></a><h3>json_boxed_deserialize ()</h3>
-<pre class="programlisting"><span class="returnvalue">gpointer</span>
-json_boxed_deserialize (<em class="parameter"><code><span class="type">GType</span> gboxed_type</code></em>,
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a>
+json_boxed_deserialize (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gboxed_type</code></em>,
                         <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Deserializes <em class="parameter"><code>node</code></em>
- into a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of <em class="parameter"><code>gboxed_type</code></em>
+ into a <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a> of <em class="parameter"><code>gboxed_type</code></em>
 </p>
 <div class="refsect3">
 <a name="json-boxed-deserialize.parameters"></a><h4>Parameters</h4>
@@ -470,8 +475,8 @@ json_boxed_deserialize (<em class="parameter"><code><span class="type">GType</sp
 </div>
 <div class="refsect3">
 <a name="json-boxed-deserialize.returns"></a><h4>Returns</h4>
-<p> the newly allocated <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a>. Use
-<code class="function">g_boxed_free()</code> to release the resources allocated by this
+<p> the newly allocated <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html"><span class="type">GBoxed</span></a>. Use
+<a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html#g-boxed-free"><code class="function">g_boxed_free()</code></a> to release the resources allocated by this
 function. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -483,6 +488,6 @@ function. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
@@ -8,7 +8,7 @@
 <link rel="up" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="prev" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="next" href="json-glib-Serializable-Interface.html" title="Serializable Interface">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -49,7 +49,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GObject</span> *
+<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-deserialize" title="json_gobject_deserialize ()">json_gobject_deserialize</a> <span class="c_punctuation">()</span>
@@ -57,7 +57,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gchar</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-to-data" title="json_gobject_to_data ()">json_gobject_to_data</a> <span class="c_punctuation">()</span>
@@ -65,7 +65,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GObject</span> *
+<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-from-data" title="json_gobject_from_data ()">json_gobject_from_data</a> <span class="c_punctuation">()</span>
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GObject</span> *
+<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a> <span class="c_punctuation">()</span>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gchar</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()">json_serialize_gobject</a> <span class="c_punctuation">()</span>
 </table></div>
 </div>
 <div class="refsect1">
+<a name="json-glib-GObject-Serialization.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-GObject-Serialization.description"></a><h2>Description</h2>
-<p>JSON-GLib provides API for serializing and deserializing <span class="type">GObject</span>
+<p>JSON-GLib provides API for serializing and deserializing <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a>
 instances to and from JSON data streams.</p>
-<p>Simple <span class="type">GObject</span> classes can be (de)serialized into JSON objects, if the
+<p>Simple <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> classes can be (de)serialized into JSON objects, if the
 properties have compatible types with the native JSON types (integers,
 booleans, strings, string vectors). If the class to be (de)serialized has
 complex data types for properties (like boxed types or other objects)
@@ -106,10 +111,10 @@ and its virtual functions.</p>
 <div class="refsect2">
 <a name="json-gobject-serialize"></a><h3>json_gobject_serialize ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
-json_gobject_serialize (<em class="parameter"><code><span class="type">GObject</span> *gobject</code></em>);</pre>
-<p>Creates a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> representing the passed <span class="type">GObject</span>
+json_gobject_serialize (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> *gobject</code></em>);</pre>
+<p>Creates a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> representing the passed <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a>
 instance. Each member of the returned JSON object will
-map to a property of the <span class="type">GObject</span></p>
+map to a property of the <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a></p>
 <div class="refsect3">
 <a name="json-gobject-serialize.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -120,7 +125,7 @@ map to a property of the <span class="type">GObject</span></p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>gobject</p></td>
-<td class="parameter_description"><p>a <span class="type">GObject</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -137,10 +142,10 @@ the resources allocated by this function. </p>
 <hr>
 <div class="refsect2">
 <a name="json-gobject-deserialize"></a><h3>json_gobject_deserialize ()</h3>
-<pre class="programlisting"><span class="returnvalue">GObject</span> *
-json_gobject_deserialize (<em class="parameter"><code><span class="type">GType</span> gtype</code></em>,
+<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
+json_gobject_deserialize (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>,
                           <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
-<p>Creates a new <span class="type">GObject</span> of type <em class="parameter"><code>gtype</code></em>
+<p>Creates a new <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> of type <em class="parameter"><code>gtype</code></em>
 , and constructs it
 using the members of the passed <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a></p>
 <div class="refsect3">
@@ -154,7 +159,7 @@ using the members of the passed <a class="link" href="json-glib-JSON-Object.html
 <tbody>
 <tr>
 <td class="parameter_name"><p>gtype</p></td>
-<td class="parameter_description"><p>the type of the <span class="type">GObject</span> to create</p></td>
+<td class="parameter_description"><p>the type of the <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> to create</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -169,8 +174,8 @@ instance of type <em class="parameter"><code>gtype</code></em>
 </div>
 <div class="refsect3">
 <a name="json-gobject-deserialize.returns"></a><h4>Returns</h4>
-<p> The newly created <span class="type">GObject</span>
-instance. Use <code class="function">g_object_unref()</code> to free the resources
+<p> The newly created <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a>
+instance. Use <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a> to free the resources
 allocated by this function. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -179,10 +184,10 @@ allocated by this function. </p>
 <hr>
 <div class="refsect2">
 <a name="json-gobject-to-data"></a><h3>json_gobject_to_data ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *
-json_gobject_to_data (<em class="parameter"><code><span class="type">GObject</span> *gobject</code></em>,
-                      <em class="parameter"><code><span class="type">gsize</span> *length</code></em>);</pre>
-<p>Serializes a <span class="type">GObject</span> into a JSON data stream, iterating recursively
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+json_gobject_to_data (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> *gobject</code></em>,
+                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> *length</code></em>);</pre>
+<p>Serializes a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> into a JSON data stream, iterating recursively
 over each property.</p>
 <p>If <em class="parameter"><code>gobject</code></em>
  implements the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="struct JsonSerializableIface"><span class="type">JsonSerializableIface</span></a> interface, it will
@@ -200,12 +205,12 @@ JSON native types.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>gobject</p></td>
-<td class="parameter_description"><p>a <span class="type">GObject</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>length</p></td>
-<td class="parameter_description"><p> return value for the length of the buffer, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> return value for the length of the buffer, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -213,20 +218,20 @@ JSON native types.</p>
 </div>
 <div class="refsect3">
 <a name="json-gobject-to-data.returns"></a><h4>Returns</h4>
-<p> a JSON data stream representing the passed <span class="type">GObject</span></p>
+<p> a JSON data stream representing the passed <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a></p>
 </div>
 <p class="since">Since: <a class="link" href="ix06.html#api-index-0.10">0.10</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-gobject-from-data"></a><h3>json_gobject_from_data ()</h3>
-<pre class="programlisting"><span class="returnvalue">GObject</span> *
-json_gobject_from_data (<em class="parameter"><code><span class="type">GType</span> gtype</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *data</code></em>,
-                        <em class="parameter"><code><span class="type">gssize</span> length</code></em>,
-                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
+json_gobject_from_data (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>,
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *data</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> length</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Deserializes a JSON data stream and creates the corresponding
-<span class="type">GObject</span> class. If <em class="parameter"><code>gtype</code></em>
+<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> class. If <em class="parameter"><code>gtype</code></em>
  implements the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="struct JsonSerializableIface"><span class="type">JsonSerializableIface</span></a>
 interface, it will be asked to deserialize all the JSON members
 into the respective properties; otherwise, the default implementation
@@ -243,7 +248,7 @@ will be used to translate the compatible JSON native types.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>gtype</p></td>
-<td class="parameter_description"><p>the <span class="type">GType</span> of object to construct</p></td>
+<td class="parameter_description"><p>the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of object to construct</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -258,7 +263,7 @@ will be used to translate the compatible JSON native types.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -266,7 +271,7 @@ will be used to translate the compatible JSON native types.</p>
 </div>
 <div class="refsect3">
 <a name="json-gobject-from-data.returns"></a><h4>Returns</h4>
-<p> a <span class="type">GObject</span> or <code class="literal">NULL</code>. </p>
+<p> a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix06.html#api-index-0.10">0.10</a></p>
@@ -274,17 +279,17 @@ will be used to translate the compatible JSON native types.</p>
 <hr>
 <div class="refsect2">
 <a name="json-construct-gobject"></a><h3>json_construct_gobject ()</h3>
-<pre class="programlisting"><span class="returnvalue">GObject</span> *
-json_construct_gobject (<em class="parameter"><code><span class="type">GType</span> gtype</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *data</code></em>,
-                        <em class="parameter"><code><span class="type">gsize</span> length</code></em>,
-                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="returnvalue">GObject</span></a> *
+json_construct_gobject (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>,
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *data</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> length</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="warning">
 <p><code class="literal">json_construct_gobject</code> has been deprecated since version 0.10 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-from-data" title="json_gobject_from_data ()"><code class="function">json_gobject_from_data()</code></a> instead</p>
 </div>
 <p>Deserializes a JSON data stream and creates the corresponding
-<span class="type">GObject</span> class. If <em class="parameter"><code>gtype</code></em>
+<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> class. If <em class="parameter"><code>gtype</code></em>
  implements the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="struct JsonSerializableIface"><span class="type">JsonSerializableIface</span></a>
 interface, it will be asked to deserialize all the JSON members
 into the respective properties; otherwise, the default implementation
@@ -301,7 +306,7 @@ will be used to translate the compatible JSON native types.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>gtype</p></td>
-<td class="parameter_description"><p>the <span class="type">GType</span> of object to construct</p></td>
+<td class="parameter_description"><p>the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of object to construct</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -316,7 +321,7 @@ will be used to translate the compatible JSON native types.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span>, or <code class="literal">NULL</code></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -324,7 +329,7 @@ will be used to translate the compatible JSON native types.</p>
 </div>
 <div class="refsect3">
 <a name="json-construct-gobject.returns"></a><h4>Returns</h4>
-<p> a <span class="type">GObject</span> or <code class="literal">NULL</code>. </p>
+<p> a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix03.html#api-index-0.4">0.4</a></p>
@@ -332,14 +337,14 @@ will be used to translate the compatible JSON native types.</p>
 <hr>
 <div class="refsect2">
 <a name="json-serialize-gobject"></a><h3>json_serialize_gobject ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *
-json_serialize_gobject (<em class="parameter"><code><span class="type">GObject</span> *gobject</code></em>,
-                        <em class="parameter"><code><span class="type">gsize</span> *length</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+json_serialize_gobject (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> *gobject</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> *length</code></em>);</pre>
 <div class="warning">
 <p><code class="literal">json_serialize_gobject</code> has been deprecated since version 0.10 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-to-data" title="json_gobject_to_data ()"><code class="function">json_gobject_to_data()</code></a> instead</p>
 </div>
-<p>Serializes a <span class="type">GObject</span> into a JSON data stream. If <em class="parameter"><code>gobject</code></em>
+<p>Serializes a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> into a JSON data stream. If <em class="parameter"><code>gobject</code></em>
  implements
 the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="struct JsonSerializableIface"><span class="type">JsonSerializableIface</span></a> interface, it will be asked to serizalize all
 its properties; otherwise, the default implementation will be use to
@@ -355,12 +360,12 @@ translate the compatible types into JSON native types.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>gobject</p></td>
-<td class="parameter_description"><p>a <span class="type">GObject</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>length</p></td>
-<td class="parameter_description"><p> return value for the length of the buffer, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> return value for the length of the buffer, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -368,7 +373,7 @@ translate the compatible types into JSON native types.</p>
 </div>
 <div class="refsect3">
 <a name="json-serialize-gobject.returns"></a><h4>Returns</h4>
-<p> a JSON data stream representing the passed <span class="type">GObject</span></p>
+<p> a JSON data stream representing the passed <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a></p>
 </div>
 </div>
 </div>
@@ -377,6 +382,6 @@ translate the compatible types into JSON native types.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 88%
rename from doc/reference/html/json-glib-JSON-Array.html
rename to doc/html/json-glib-JSON-Array.html
index 8c4e23e..debd1a1 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="Data Types">
 <link rel="prev" href="json-glib-JSON-Node.html" title="JSON Node">
 <link rel="next" href="json-glib-JSON-Object.html" title="JSON Object">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -82,7 +82,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-is-immutable" title="json_array_is_immutable ()">json_array_is_immutable</a> <span class="c_punctuation">()</span>
@@ -90,7 +90,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-hash" title="json_array_hash ()">json_array_hash</a> <span class="c_punctuation">()</span>
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-equal" title="json_array_equal ()">json_array_equal</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GList</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-get-elements" title="json_array_get_elements ()">json_array_get_elements</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-get-length" title="json_array_get_length ()">json_array_get_length</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-get-boolean-element" title="json_array_get_boolean_element ()">json_array_get_boolean_element</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gdouble</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-get-double-element" title="json_array_get_double_element ()">json_array_get_double_element</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gint64</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-get-int-element" title="json_array_get_int_element ()">json_array_get_int_element</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-get-null-element" title="json_array_get_null_element ()">json_array_get_null_element</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">gchar</span> *
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Array.html#json-array-get-string-element" title="json_array_get_string_element ()">json_array_get_string_element</a> <span class="c_punctuation">()</span>
 </div>
 <div class="refsect1">
 <a name="json-glib-JSON-Array.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html">GBoxed</a>
     <span class="lineart">╰──</span> JsonArray
 </pre>
 </div>
 <div class="refsect1">
+<a name="json-glib-JSON-Array.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-JSON-Array.description"></a><h2>Description</h2>
 <p><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> is the representation of the array type inside JSON. It contains
 <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> elements, which may contain fundamental types, other arrays or
@@ -331,7 +336,7 @@ json_array_new (<em class="parameter"><code><span class="type">void</span></code
 <div class="refsect2">
 <a name="json-array-sized-new"></a><h3>json_array_sized_new ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="returnvalue">JsonArray</span></a> *
-json_array_sized_new (<em class="parameter"><code><span class="type">guint</span> n_elements</code></em>);</pre>
+json_array_sized_new (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_elements</code></em>);</pre>
 <p>Creates a new <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> with <em class="parameter"><code>n_elements</code></em>
  slots already allocated.</p>
 <p><span class="annotation">[<acronym title="This symbol is a constructor, not a static method."><span class="acronym">constructor</span></acronym>]</span></p>
@@ -437,7 +442,7 @@ recursively seal all elements in the array too.</p>
 <hr>
 <div class="refsect2">
 <a name="json-array-is-immutable"></a><h3>json_array_is_immutable ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_array_is_immutable (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>);</pre>
 <p>Check whether the given <em class="parameter"><code>array</code></em>
  has been marked as immutable by calling
@@ -459,7 +464,7 @@ json_array_is_immutable (<em class="parameter"><code><a class="link" href="json-
 </div>
 <div class="refsect3">
 <a name="json-array-is-immutable.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the <em class="parameter"><code>array</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <em class="parameter"><code>array</code></em>
 is immutable</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
@@ -467,8 +472,8 @@ is immutable</p>
 <hr>
 <div class="refsect2">
 <a name="json-array-hash"></a><h3>json_array_hash ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
-json_array_hash (<em class="parameter"><code><span class="type">gconstpointer</span> key</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+json_array_hash (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> key</code></em>);</pre>
 <p>Calculate a hash value for the given <em class="parameter"><code>key</code></em>
  (a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a>).</p>
 <p>The hash is calculated over the array and all its elements, recursively. If
@@ -499,9 +504,9 @@ proportionally with the length of the array.</p>
 <hr>
 <div class="refsect2">
 <a name="json-array-equal"></a><h3>json_array_equal ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
-json_array_equal (<em class="parameter"><code><span class="type">gconstpointer</span> a</code></em>,
-                  <em class="parameter"><code><span class="type">gconstpointer</span> b</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+json_array_equal (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> a</code></em>,
+                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> b</code></em>);</pre>
 <p>Check whether <em class="parameter"><code>a</code></em>
  and <em class="parameter"><code>b</code></em>
  are equal <a href="json-glib-JSON-Array.html#JsonArray-struct"><span class="type">JsonArrays</span></a>, meaning they have the same
@@ -531,9 +536,9 @@ are equal.</p>
 </div>
 <div class="refsect3">
 <a name="json-array-equal.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if <em class="parameter"><code>a</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>a</code></em>
 and <em class="parameter"><code>b</code></em>
-are equal; <code class="literal">FALSE</code> otherwise</p>
+are equal; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
 </div>
@@ -575,7 +580,7 @@ json_array_add_element (<em class="parameter"><code><a class="link" href="json-g
 <a name="json-array-get-element"></a><h3>json_array_get_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_array_get_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                        <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Retrieves the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> containing the value of the element at <em class="parameter"><code>index_</code></em>
 
 inside a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a>.</p>
@@ -612,7 +617,7 @@ inside a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class=
 <a name="json-array-dup-element"></a><h3>json_array_dup_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_array_dup_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                        <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Retrieves a copy of the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> containing the value of the
 element at <em class="parameter"><code>index_</code></em>
  inside a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a></p>
@@ -649,7 +654,7 @@ index. Use <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title
 <hr>
 <div class="refsect2">
 <a name="json-array-get-elements"></a><h3>json_array_get_elements ()</h3>
-<pre class="programlisting"><span class="returnvalue">GList</span> *
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
 json_array_get_elements (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>);</pre>
 <p>Gets the elements of a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> as a list of <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> instances.</p>
 <div class="refsect3">
@@ -669,17 +674,17 @@ json_array_get_elements (<em class="parameter"><code><a class="link" href="json-
 </div>
 <div class="refsect3">
 <a name="json-array-get-elements.returns"></a><h4>Returns</h4>
-<p> a <span class="type">GList</span>
+<p> a <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a>
 containing the elements of the array. The contents of the list are
 owned by the array and should never be modified or freed. Use
-<code class="function">g_list_free()</code> on the returned list when done using it. </p>
+<a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"><code class="function">g_list_free()</code></a> on the returned list when done using it. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> JsonNode][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-array-get-length"></a><h3>json_array_get_length ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 json_array_get_length (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>);</pre>
 <p>Retrieves the length of a <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a></p>
 <div class="refsect3">
@@ -707,7 +712,7 @@ json_array_get_length (<em class="parameter"><code><a class="link" href="json-gl
 <a name="json-array-remove-element"></a><h3>json_array_remove_element ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_array_remove_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                           <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Removes the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> inside <em class="parameter"><code>array</code></em>
  at <em class="parameter"><code>index_</code></em>
  freeing its allocated
@@ -740,9 +745,9 @@ resources.</p>
 <a name="JsonArrayForeach"></a><h3>JsonArrayForeach ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*JsonArrayForeach<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                     <em class="parameter"><code><span class="type">guint</span> index_</code></em>,
+                     <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>,
                      <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *element_node</code></em>,
-                     <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
+                     <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>The function to be passed to <a class="link" href="json-glib-JSON-Array.html#json-array-foreach-element" title="json_array_foreach_element ()"><code class="function">json_array_foreach_element()</code></a>. You
 should not add or remove elements to and from <em class="parameter"><code>array</code></em>
  within
@@ -789,7 +794,7 @@ this function. It is safe to change the value of <em class="parameter"><code>ele
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_array_foreach_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
                             <em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArrayForeach" title="JsonArrayForeach ()"><span class="type">JsonArrayForeach</span></a> func</code></em>,
-                            <em class="parameter"><code><span class="type">gpointer</span> data</code></em>);</pre>
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>);</pre>
 <p>Iterates over all elements of <em class="parameter"><code>array</code></em>
  and calls <em class="parameter"><code>func</code></em>
  on
@@ -869,7 +874,7 @@ of the newly added <a class="link" href="json-glib-JSON-Array.html#JsonArray"><s
 <a name="json-array-get-array-element"></a><h3>json_array_get_array_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="returnvalue">JsonArray</span></a> *
 json_array_get_array_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                              <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Conveniently retrieves the array from the element at <em class="parameter"><code>index_</code></em>
 
 inside <em class="parameter"><code>array</code></em>
@@ -909,7 +914,7 @@ inside <em class="parameter"><code>array</code></em>
 <a name="json-array-add-boolean-element"></a><h3>json_array_add_boolean_element ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_array_add_boolean_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                                <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);</pre>
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
 <p>Conveniently adds a boolean <em class="parameter"><code>value</code></em>
  into <em class="parameter"><code>array</code></em>
 </p>
@@ -941,9 +946,9 @@ json_array_add_boolean_element (<em class="parameter"><code><a class="link" href
 <hr>
 <div class="refsect2">
 <a name="json-array-get-boolean-element"></a><h3>json_array_get_boolean_element ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_array_get_boolean_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                                <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Conveniently retrieves the boolean value of the element at <em class="parameter"><code>index_</code></em>
 
 inside <em class="parameter"><code>array</code></em>
@@ -982,7 +987,7 @@ inside <em class="parameter"><code>array</code></em>
 <a name="json-array-add-double-element"></a><h3>json_array_add_double_element ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_array_add_double_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                               <em class="parameter"><code><span class="type">gdouble</span> value</code></em>);</pre>
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>);</pre>
 <p>Conveniently adds a floating point <em class="parameter"><code>value</code></em>
  into <em class="parameter"><code>array</code></em>
 </p>
@@ -1014,9 +1019,9 @@ json_array_add_double_element (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="json-array-get-double-element"></a><h3>json_array_get_double_element ()</h3>
-<pre class="programlisting"><span class="returnvalue">gdouble</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 json_array_get_double_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                               <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Conveniently retrieves the floating point value of the element at
 <em class="parameter"><code>index_</code></em>
  inside <em class="parameter"><code>array</code></em>
@@ -1055,7 +1060,7 @@ json_array_get_double_element (<em class="parameter"><code><a class="link" href=
 <a name="json-array-add-int-element"></a><h3>json_array_add_int_element ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_array_add_int_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                            <em class="parameter"><code><span class="type">gint64</span> value</code></em>);</pre>
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> value</code></em>);</pre>
 <p>Conveniently adds an integer <em class="parameter"><code>value</code></em>
  into <em class="parameter"><code>array</code></em>
 </p>
@@ -1087,9 +1092,9 @@ json_array_add_int_element (<em class="parameter"><code><a class="link" href="js
 <hr>
 <div class="refsect2">
 <a name="json-array-get-int-element"></a><h3>json_array_get_int_element ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 json_array_get_int_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                            <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Conveniently retrieves the integer value of the element at <em class="parameter"><code>index_</code></em>
 
 inside <em class="parameter"><code>array</code></em>
@@ -1151,9 +1156,9 @@ json_array_add_null_element (<em class="parameter"><code><a class="link" href="j
 <hr>
 <div class="refsect2">
 <a name="json-array-get-null-element"></a><h3>json_array_get_null_element ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_array_get_null_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                             <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Conveniently retrieves whether the element at <em class="parameter"><code>index_</code></em>
  is set to null</p>
 <p>See also: <a class="link" href="json-glib-JSON-Array.html#json-array-get-element" title="json_array_get_element ()"><code class="function">json_array_get_element()</code></a>, <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-TYPE:CAPS" title="JSON_NODE_TYPE()"><code class="function">JSON_NODE_TYPE()</code></a>, <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a></p>
@@ -1181,7 +1186,7 @@ json_array_get_null_element (<em class="parameter"><code><a class="link" href="j
 </div>
 <div class="refsect3">
 <a name="json-array-get-null-element.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the element is null</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the element is null</p>
 </div>
 <p class="since">Since: <a class="link" href="ix05.html#api-index-0.8">0.8</a></p>
 </div>
@@ -1225,7 +1230,7 @@ of the newly added <a class="link" href="json-glib-JSON-Object.html#JsonObject">
 <a name="json-array-get-object-element"></a><h3>json_array_get_object_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="returnvalue">JsonObject</span></a> *
 json_array_get_object_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                               <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Conveniently retrieves the object from the element at <em class="parameter"><code>index_</code></em>
 
 inside <em class="parameter"><code>array</code></em>
@@ -1265,7 +1270,7 @@ inside <em class="parameter"><code>array</code></em>
 <a name="json-array-add-string-element"></a><h3>json_array_add_string_element ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_array_add_string_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *value</code></em>);</pre>
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);</pre>
 <p>Conveniently adds a string <em class="parameter"><code>value</code></em>
  into <em class="parameter"><code>array</code></em>
 </p>
@@ -1297,9 +1302,9 @@ json_array_add_string_element (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="json-array-get-string-element"></a><h3>json_array_get_string_element ()</h3>
-<pre class="programlisting">const <span class="returnvalue">gchar</span> *
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_array_get_string_element (<em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *array</code></em>,
-                               <em class="parameter"><code><span class="type">guint</span> index_</code></em>);</pre>
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index_</code></em>);</pre>
 <p>Conveniently retrieves the string value of the element at <em class="parameter"><code>index_</code></em>
 
 inside <em class="parameter"><code>array</code></em>
@@ -1346,6 +1351,6 @@ and should only be accessed by the provided API</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
@@ -8,7 +8,7 @@
 <link rel="up" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="prev" href="json-glib-Boxed-Types-Serialization.html" title="Boxed Types Serialization">
 <link rel="next" href="json-glib-Versioning-information.html" title="Versioning information">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -49,7 +49,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gchar</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-serialize-data" title="json_gvariant_serialize_data ()">json_gvariant_serialize_data</a> <span class="c_punctuation">()</span>
@@ -57,7 +57,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GVariant</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-deserialize" title="json_gvariant_deserialize ()">json_gvariant_deserialize</a> <span class="c_punctuation">()</span>
@@ -65,7 +65,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GVariant</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-deserialize-data" title="json_gvariant_deserialize_data ()">json_gvariant_deserialize_data</a> <span class="c_punctuation">()</span>
 </table></div>
 </div>
 <div class="refsect1">
+<a name="json-glib-JSON-GVariant-Integration.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-JSON-GVariant-Integration.description"></a><h2>Description</h2>
 <p>Use <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-serialize" title="json_gvariant_serialize ()"><code class="function">json_gvariant_serialize()</code></a> and <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-serialize-data" title="json_gvariant_serialize_data ()"><code class="function">json_gvariant_serialize_data()</code></a> to
-convert from any <span class="type">GVariant</span> value to a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> tree or its string
+convert from any <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> value to a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> tree or its string
 representation.</p>
 <p>Use <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-deserialize" title="json_gvariant_deserialize ()"><code class="function">json_gvariant_deserialize()</code></a> and <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-deserialize-data" title="json_gvariant_deserialize_data ()"><code class="function">json_gvariant_deserialize_data()</code></a> to
-obtain the <span class="type">GVariant</span> value from a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> tree or directly from a JSON
+obtain the <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> value from a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> tree or directly from a JSON
 string.</p>
-<p>Since many <span class="type">GVariant</span> data types cannot be directly represented as
-JSON, a <span class="type">GVariant</span> type string (signature) should be provided to these
+<p>Since many <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> data types cannot be directly represented as
+JSON, a <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> type string (signature) should be provided to these
 methods in order to obtain a correct, type-contrained result.
 If no signature is provided, conversion can still be done, but the
-resulting <span class="type">GVariant</span> value will be "guessed" from the JSON data types
+resulting <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> value will be "guessed" from the JSON data types
 using the following rules:</p>
 <div class="refsect3">
-<a name="id-1.5.5.4.5"></a><h4>Strings</h4>
+<a name="id-1.5.5.5.5"></a><h4>Strings</h4>
 <p>JSON strings map to GVariant <code class="literal">(s)</code>.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.4.6"></a><h4>Integers</h4>
+<a name="id-1.5.5.5.6"></a><h4>Integers</h4>
 <p>JSON integers map to GVariant int64 <code class="literal">(x)</code>.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.4.7"></a><h4>Booleans</h4>
+<a name="id-1.5.5.5.7"></a><h4>Booleans</h4>
 <p>JSON booleans map to GVariant boolean <code class="literal">(b)</code>.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.4.8"></a><h4>Numbers</h4>
+<a name="id-1.5.5.5.8"></a><h4>Numbers</h4>
 <p>JSON numbers map to GVariant double <code class="literal">(d)</code>.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.4.9"></a><h4>Arrays</h4>
+<a name="id-1.5.5.5.9"></a><h4>Arrays</h4>
 <p>JSON arrays map to GVariant arrays of variants <code class="literal">(av)</code>.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.4.10"></a><h4>Objects</h4>
+<a name="id-1.5.5.5.10"></a><h4>Objects</h4>
 <p>JSON objects map to GVariant dictionaries of string to variants <code class="literal">(a{sv})</code>.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.4.11"></a><h4>Null values</h4>
+<a name="id-1.5.5.5.11"></a><h4>Null values</h4>
 <p>JSON null values map to GVariant maybe variants <code class="literal">(mv)</code>.</p>
 </div>
 </div>
@@ -122,7 +127,7 @@ using the following rules:</p>
 <div class="refsect2">
 <a name="json-gvariant-serialize"></a><h3>json_gvariant_serialize ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
-json_gvariant_serialize (<em class="parameter"><code><span class="type">GVariant</span> *variant</code></em>);</pre>
+json_gvariant_serialize (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *variant</code></em>);</pre>
 <p>Converts <em class="parameter"><code>variant</code></em>
  to a JSON tree.</p>
 <div class="refsect3">
@@ -135,7 +140,7 @@ json_gvariant_serialize (<em class="parameter"><code><span class="type">GVariant
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>variant</p></td>
-<td class="parameter_description"><p>A <span class="type">GVariant</span> to convert</p></td>
+<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> to convert</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -152,9 +157,9 @@ JSON data structure obtained from <em class="parameter"><code>variant</code></em
 <hr>
 <div class="refsect2">
 <a name="json-gvariant-serialize-data"></a><h3>json_gvariant_serialize_data ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *
-json_gvariant_serialize_data (<em class="parameter"><code><span class="type">GVariant</span> *variant</code></em>,
-                              <em class="parameter"><code><span class="type">gsize</span> *length</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+json_gvariant_serialize_data (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *variant</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> *length</code></em>);</pre>
 <p>Converts <em class="parameter"><code>variant</code></em>
  to its JSON encoded string representation. This method
 is actually a helper function. It uses <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-serialize" title="json_gvariant_serialize ()"><code class="function">json_gvariant_serialize()</code></a> to obtain the
@@ -170,13 +175,13 @@ JSON tree, and then <a class="link" href="JsonGenerator.html" title="JsonGenerat
 <tbody>
 <tr>
 <td class="parameter_name"><p>variant</p></td>
-<td class="parameter_description"><p>A <span class="type">GVariant</span> to convert</p></td>
+<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> to convert</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>length</p></td>
 <td class="parameter_description"><p> Return location for the length of the returned
-string, or <code class="literal">NULL</code>. </p></td>
+string, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -194,23 +199,23 @@ string, or <code class="literal">NULL</code>. </p></td>
 <hr>
 <div class="refsect2">
 <a name="json-gvariant-deserialize"></a><h3>json_gvariant_deserialize ()</h3>
-<pre class="programlisting"><span class="returnvalue">GVariant</span> *
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
 json_gvariant_deserialize (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *json_node</code></em>,
-                           <em class="parameter"><code>const <span class="type">gchar</span> *signature</code></em>,
-                           <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *signature</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Converts a JSON data structure to a GVariant value using <em class="parameter"><code>signature</code></em>
  to
-resolve ambiguous data types. If no error occurs, the resulting <span class="type">GVariant</span>
+resolve ambiguous data types. If no error occurs, the resulting <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a>
 is guaranteed to conform to <em class="parameter"><code>signature</code></em>
 .</p>
 <p>If <em class="parameter"><code>signature</code></em>
- is not <code class="literal">NULL</code> but does not represent a valid GVariant type
-string, <code class="literal">NULL</code> is returned and error is set to <code class="literal">G_IO_ERROR_INVALID_ARGUMENT</code>.
+ is not <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> but does not represent a valid GVariant type
+string, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned and error is set to <a href="https://developer.gnome.org/gio/unstable/gio-GIOError.html#G-IO-ERROR-INVALID-ARGUMENT:CAPS"><code class="literal">G_IO_ERROR_INVALID_ARGUMENT</code></a>.
 If a <em class="parameter"><code>signature</code></em>
  is provided but the JSON structure cannot be mapped to it,
-<code class="literal">NULL</code> is returned and error is set to <code class="literal">G_IO_ERROR_INVALID_DATA</code>.
+<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned and error is set to <a href="https://developer.gnome.org/gio/unstable/gio-GIOError.html#G-IO-ERROR-INVALID-DATA:CAPS"><code class="literal">G_IO_ERROR_INVALID_DATA</code></a>.
 If <em class="parameter"><code>signature</code></em>
- is <code class="literal">NULL</code>, the conversion is done based strictly on the types
+ is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the conversion is done based strictly on the types
 in the JSON nodes.</p>
 <p>The returned variant has a floating reference that will need to be sunk
 by the caller code.</p>
@@ -230,12 +235,12 @@ by the caller code.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>signature</p></td>
-<td class="parameter_description"><p> A valid <span class="type">GVariant</span> type string, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> A valid <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> type string, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>A pointer to a <span class="type">GError</span></p></td>
+<td class="parameter_description"><p>A pointer to a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -243,9 +248,9 @@ by the caller code.</p>
 </div>
 <div class="refsect3">
 <a name="json-gvariant-deserialize.returns"></a><h4>Returns</h4>
-<p> A newly created, floating <span class="type">GVariant</span>
+<p> A newly created, floating <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a>
 compliant with <em class="parameter"><code>signature</code></em>
-, or <code class="literal">NULL</code> on error. </p>
+, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
@@ -253,12 +258,12 @@ compliant with <em class="parameter"><code>signature</code></em>
 <hr>
 <div class="refsect2">
 <a name="json-gvariant-deserialize-data"></a><h3>json_gvariant_deserialize_data ()</h3>
-<pre class="programlisting"><span class="returnvalue">GVariant</span> *
-json_gvariant_deserialize_data (<em class="parameter"><code>const <span class="type">gchar</span> *json</code></em>,
-                                <em class="parameter"><code><span class="type">gssize</span> length</code></em>,
-                                <em class="parameter"><code>const <span class="type">gchar</span> *signature</code></em>,
-                                <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
-<p>Converts a JSON string to a <span class="type">GVariant</span> value. This method works exactly
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+json_gvariant_deserialize_data (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *json</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> length</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *signature</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Converts a JSON string to a <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> value. This method works exactly
 like <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-deserialize" title="json_gvariant_deserialize ()"><code class="function">json_gvariant_deserialize()</code></a>, but takes a JSON encoded string instead.
 The string is first converted to a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> using <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>, and then
 <a class="link" href="json-glib-JSON-GVariant-Integration.html#json-gvariant-deserialize" title="json_gvariant_deserialize ()"><code class="function">json_gvariant_deserialize()</code></a> is called.</p>
@@ -281,17 +286,17 @@ by the caller code.</p>
 <tr>
 <td class="parameter_name"><p>length</p></td>
 <td class="parameter_description"><p>The length of <em class="parameter"><code>json</code></em>
-, or -1 if <code class="literal">NULL</code>-terminated</p></td>
+, or -1 if <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>signature</p></td>
-<td class="parameter_description"><p> A valid <span class="type">GVariant</span> type string, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> A valid <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> type string, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>A pointer to a <span class="type">GError</span></p></td>
+<td class="parameter_description"><p>A pointer to a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -299,9 +304,9 @@ by the caller code.</p>
 </div>
 <div class="refsect3">
 <a name="json-gvariant-deserialize-data.returns"></a><h4>Returns</h4>
-<p> A newly created, floating <span class="type">GVariant</span> compliant
+<p> A newly created, floating <a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> compliant
 with <em class="parameter"><code>signature</code></em>
-, or <code class="literal">NULL</code> on error. </p>
+, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
@@ -312,6 +317,6 @@ with <em class="parameter"><code>signature</code></em>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 88%
rename from doc/reference/html/json-glib-JSON-Node.html
rename to doc/html/json-glib-JSON-Node.html
index b0c71da..d809901 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="Data Types">
 <link rel="prev" href="ch01.html" title="Data Types">
 <link rel="next" href="json-glib-JSON-Array.html" title="JSON Array">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-is-immutable" title="json_node_is_immutable ()">json_node_is_immutable</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-hash" title="json_node_hash ()">json_node_hash</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-equal" title="json_node_equal ()">json_node_equal</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-get-boolean" title="json_node_get_boolean ()">json_node_get_boolean</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gdouble</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-get-double" title="json_node_get_double ()">json_node_get_double</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gint64</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-get-int" title="json_node_get_int ()">json_node_get_int</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">gchar</span> *
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-get-string" title="json_node_get_string ()">json_node_get_string</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gchar</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-dup-string" title="json_node_dup_string ()">json_node_dup_string</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">gchar</span> *
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-type-name" title="json_node_type_name ()">json_node_type_name</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GType</span>
+<a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-get-value-type" title="json_node_get_value_type ()">json_node_get_value_type</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-node-is-null" title="json_node_is_null ()">json_node_is_null</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-string-hash" title="json_string_hash ()">json_string_hash</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-string-equal" title="json_string_equal ()">json_string_equal</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Node.html#json-string-compare" title="json_string_compare ()">json_string_compare</a> <span class="c_punctuation">()</span>
 </div>
 <div class="refsect1">
 <a name="json-glib-JSON-Node.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html">GBoxed</a>
     <span class="lineart">╰──</span> JsonNode
 </pre>
 </div>
 <div class="refsect1">
+<a name="json-glib-JSON-Node.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-JSON-Node.description"></a><h2>Description</h2>
 <p>A <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> is a generic container of elements inside a JSON stream.
 It can contain fundamental types (integers, booleans, floating point
@@ -478,8 +483,8 @@ numbers, strings) and complex types (arrays and objects).</p>
 <p>When parsing a JSON data stream you extract the root node and walk
 the node tree by retrieving the type of data contained inside the
 node with the <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-TYPE:CAPS" title="JSON_NODE_TYPE()"><code class="literal">JSON_NODE_TYPE</code></a> macro. If the node contains a fundamental
-type you can retrieve a copy of the <span class="type">GValue</span> holding it with the
-<a class="link" href="json-glib-JSON-Node.html#json-node-get-value" title="json_node_get_value ()"><code class="function">json_node_get_value()</code></a> function, and then use the <span class="type">GValue</span> API to extract
+type you can retrieve a copy of the <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> holding it with the
+<a class="link" href="json-glib-JSON-Node.html#json-node-get-value" title="json_node_get_value ()"><code class="function">json_node_get_value()</code></a> function, and then use the <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> API to extract
 the data; if the node contains a complex type you can retrieve the
 <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> or the <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> using <a class="link" href="json-glib-JSON-Node.html#json-node-get-object" title="json_node_get_object ()"><code class="function">json_node_get_object()</code></a> or
 <a class="link" href="json-glib-JSON-Node.html#json-node-get-array" title="json_node_get_array ()"><code class="function">json_node_get_array()</code></a> respectively, and then retrieve the nodes
@@ -530,7 +535,7 @@ and <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_
 <a name="JSON-NODE-HOLDS:CAPS"></a><h3>JSON_NODE_HOLDS()</h3>
 <pre class="programlisting">#define JSON_NODE_HOLDS(node,t)         (json_node_get_node_type ((node)) == (t))
 </pre>
-<p>Evaluates to <code class="literal">TRUE</code> if the <em class="parameter"><code>node</code></em>
+<p>Evaluates to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <em class="parameter"><code>node</code></em>
  holds type <em class="parameter"><code>t</code></em>
 </p>
 <div class="refsect3">
@@ -562,7 +567,7 @@ and <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_
 <a name="JSON-NODE-HOLDS-VALUE:CAPS"></a><h3>JSON_NODE_HOLDS_VALUE()</h3>
 <pre class="programlisting">#define JSON_NODE_HOLDS_VALUE(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_VALUE))
 </pre>
-<p>Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em>
+<p>Evaluates to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>node</code></em>
  holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE:CAPS"><code class="literal">JSON_NODE_VALUE</code></a></p>
 <div class="refsect3">
 <a name="JSON-NODE-HOLDS-VALUE.parameters"></a><h4>Parameters</h4>
@@ -586,7 +591,7 @@ and <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_
 <a name="JSON-NODE-HOLDS-OBJECT:CAPS"></a><h3>JSON_NODE_HOLDS_OBJECT()</h3>
 <pre class="programlisting">#define JSON_NODE_HOLDS_OBJECT(node)    (JSON_NODE_HOLDS ((node), JSON_NODE_OBJECT))
 </pre>
-<p>Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em>
+<p>Evaluates to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>node</code></em>
  holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-OBJECT:CAPS"><code class="literal">JSON_NODE_OBJECT</code></a></p>
 <div class="refsect3">
 <a name="JSON-NODE-HOLDS-OBJECT.parameters"></a><h4>Parameters</h4>
@@ -610,7 +615,7 @@ and <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_
 <a name="JSON-NODE-HOLDS-ARRAY:CAPS"></a><h3>JSON_NODE_HOLDS_ARRAY()</h3>
 <pre class="programlisting">#define JSON_NODE_HOLDS_ARRAY(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_ARRAY))
 </pre>
-<p>Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em>
+<p>Evaluates to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>node</code></em>
  holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-ARRAY:CAPS"><code class="literal">JSON_NODE_ARRAY</code></a></p>
 <div class="refsect3">
 <a name="JSON-NODE-HOLDS-ARRAY.parameters"></a><h4>Parameters</h4>
@@ -634,7 +639,7 @@ and <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_
 <a name="JSON-NODE-HOLDS-NULL:CAPS"></a><h3>JSON_NODE_HOLDS_NULL()</h3>
 <pre class="programlisting">#define JSON_NODE_HOLDS_NULL(node)      (JSON_NODE_HOLDS ((node), JSON_NODE_NULL))
 </pre>
-<p>Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em>
+<p>Evaluates to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>node</code></em>
  holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a></p>
 <div class="refsect3">
 <a name="JSON-NODE-HOLDS-NULL.parameters"></a><h4>Parameters</h4>
@@ -715,7 +720,7 @@ to</p></td>
 <a name="json-node-init-int"></a><h3>json_node_init_int ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_node_init_int (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                    <em class="parameter"><code><span class="type">gint64</span> value</code></em>);</pre>
+                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> value</code></em>);</pre>
 <p>Initializes <em class="parameter"><code>node</code></em>
  to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE:CAPS"><code class="literal">JSON_NODE_VALUE</code></a> and sets <em class="parameter"><code>value</code></em>
  into it.</p>
@@ -755,7 +760,7 @@ the given type, and any data contained will be cleared.</p>
 <a name="json-node-init-double"></a><h3>json_node_init_double ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_node_init_double (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                       <em class="parameter"><code><span class="type">gdouble</span> value</code></em>);</pre>
+                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>);</pre>
 <p>Initializes <em class="parameter"><code>node</code></em>
  to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE:CAPS"><code class="literal">JSON_NODE_VALUE</code></a> and sets <em class="parameter"><code>value</code></em>
  into it.</p>
@@ -795,7 +800,7 @@ the given type, and any data contained will be cleared.</p>
 <a name="json-node-init-boolean"></a><h3>json_node_init_boolean ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_node_init_boolean (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                        <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);</pre>
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
 <p>Initializes <em class="parameter"><code>node</code></em>
  to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE:CAPS"><code class="literal">JSON_NODE_VALUE</code></a> and sets <em class="parameter"><code>value</code></em>
  into it.</p>
@@ -931,7 +936,7 @@ the given type, and any data contained will be cleared.</p>
 <tr>
 <td class="parameter_name"><p>object</p></td>
 <td class="parameter_description"><p> the <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> to initialize <em class="parameter"><code>node</code></em>
-with, or <code class="literal">NULL</code>. </p></td>
+with, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -974,7 +979,7 @@ the given type, and any data contained will be cleared.</p>
 <tr>
 <td class="parameter_name"><p>array</p></td>
 <td class="parameter_description"><p> the <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> to initialize <em class="parameter"><code>node</code></em>
-with, or <code class="literal">NULL</code>. </p></td>
+with, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -1144,7 +1149,7 @@ freed.</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-is-immutable"></a><h3>json_node_is_immutable ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_node_is_immutable (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Check whether the given <em class="parameter"><code>node</code></em>
  has been marked as immutable by calling
@@ -1166,7 +1171,7 @@ json_node_is_immutable (<em class="parameter"><code><a class="link" href="json-g
 </div>
 <div class="refsect3">
 <a name="json-node-is-immutable.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the <em class="parameter"><code>node</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <em class="parameter"><code>node</code></em>
 is immutable</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
@@ -1203,8 +1208,8 @@ sealed, etc.</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-hash"></a><h3>json_node_hash ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
-json_node_hash (<em class="parameter"><code><span class="type">gconstpointer</span> key</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+json_node_hash (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> key</code></em>);</pre>
 <p>Calculate a hash value for the given <em class="parameter"><code>key</code></em>
  (a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>).</p>
 <p>The hash is calculated over the node and its value, recursively. If the node
@@ -1236,9 +1241,9 @@ in the <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class=
 <hr>
 <div class="refsect2">
 <a name="json-node-equal"></a><h3>json_node_equal ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
-json_node_equal (<em class="parameter"><code><span class="type">gconstpointer</span> a</code></em>,
-                 <em class="parameter"><code><span class="type">gconstpointer</span> b</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+json_node_equal (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> a</code></em>,
+                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> b</code></em>);</pre>
 <p>Check whether <em class="parameter"><code>a</code></em>
  and <em class="parameter"><code>b</code></em>
  are equal <a href="json-glib-JSON-Node.html#JsonNode-struct"><span class="type">JsonNodes</span></a>, meaning they have the same
@@ -1269,9 +1274,9 @@ integer value 4.</p>
 </div>
 <div class="refsect3">
 <a name="json-node-equal.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if <em class="parameter"><code>a</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>a</code></em>
 and <em class="parameter"><code>b</code></em>
-are equal; <code class="literal">FALSE</code> otherwise</p>
+are equal; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
 </div>
@@ -1347,7 +1352,7 @@ json_node_take_array (<em class="parameter"><code><a class="link" href="json-gli
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="returnvalue">JsonArray</span></a> *
 json_node_get_array (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Retrieves the <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. If the node does not
-hold an array value, <code class="literal">NULL</code> is returned.</p>
+hold an array value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned.</p>
 <div class="refsect3">
 <a name="json-node-get-array.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1376,7 +1381,7 @@ hold an array value, <code class="literal">NULL</code> is returned.</p>
 json_node_dup_array (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Retrieves the <a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> and returns it
 with its reference count increased by one. If the node does not hold an
-array value, <code class="literal">NULL</code> is returned.</p>
+array value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned.</p>
 <div class="refsect3">
 <a name="json-node-dup-array.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1410,7 +1415,7 @@ json_node_set_object (<em class="parameter"><code><a class="link" href="json-gli
 . The reference count of <em class="parameter"><code>object</code></em>
  is increased.</p>
 <p>If <em class="parameter"><code>object</code></em>
- is <code class="literal">NULL</code>, the node’s existing object is cleared.</p>
+ is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the node’s existing object is cleared.</p>
 <p>It is an error to call this on an immutable node.</p>
 <div class="refsect3">
 <a name="json-node-set-object.parameters"></a><h4>Parameters</h4>
@@ -1475,7 +1480,7 @@ json_node_take_object (<em class="parameter"><code><a class="link" href="json-gl
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="returnvalue">JsonObject</span></a> *
 json_node_get_object (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Retrieves the <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. If the node does not
-hold an object value, <code class="literal">NULL</code> is returned.</p>
+hold an object value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned.</p>
 <div class="refsect3">
 <a name="json-node-get-object.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1505,7 +1510,7 @@ json_node_dup_object (<em class="parameter"><code><a class="link" href="json-gli
 <p>Retrieves the <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> inside <em class="parameter"><code>node</code></em>
 . The reference count of
 the returned object is increased. If the node does not hold an object value,
-<code class="literal">NULL</code> is returned.</p>
+<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned.</p>
 <div class="refsect3">
 <a name="json-node-dup-object.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1532,10 +1537,10 @@ the returned object is increased. If the node does not hold an object value,
 <a name="json-node-set-value"></a><h3>json_node_set_value ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_node_set_value (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                     <em class="parameter"><code>const <span class="type">GValue</span> *value</code></em>);</pre>
+                     <em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>Sets <em class="parameter"><code>value</code></em>
  inside <em class="parameter"><code>node</code></em>
-. The passed <span class="type">GValue</span> is copied into the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>.</p>
+. The passed <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> is copied into the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>.</p>
 <p>It is an error to call this on an immutable node.</p>
 <div class="refsect3">
 <a name="json-node-set-value.parameters"></a><h4>Parameters</h4>
@@ -1553,7 +1558,7 @@ json_node_set_value (<em class="parameter"><code><a class="link" href="json-glib
 </tr>
 <tr>
 <td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>the <span class="type">GValue</span> to set</p></td>
+<td class="parameter_description"><p>the <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> to set</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -1565,10 +1570,10 @@ json_node_set_value (<em class="parameter"><code><a class="link" href="json-glib
 <a name="json-node-get-value"></a><h3>json_node_get_value ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_node_get_value (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                     <em class="parameter"><code><span class="type">GValue</span> *value</code></em>);</pre>
+                     <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>Retrieves a value from a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> and copies into <em class="parameter"><code>value</code></em>
 . When done
-using it, call <code class="function">g_value_unset()</code> on the <span class="type">GValue</span>. If the node does not hold a
+using it, call <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#g-value-unset"><code class="function">g_value_unset()</code></a> on the <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>. If the node does not hold a
 scalar value, <em class="parameter"><code>value</code></em>
  is not modified.</p>
 <div class="refsect3">
@@ -1599,7 +1604,7 @@ scalar value, <em class="parameter"><code>value</code></em>
 <a name="json-node-set-boolean"></a><h3>json_node_set_boolean ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_node_set_boolean (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                       <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);</pre>
+                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
 <p>Sets <em class="parameter"><code>value</code></em>
  as the boolean content of the <em class="parameter"><code>node</code></em>
 , replacing any existing
@@ -1631,12 +1636,12 @@ content.</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-get-boolean"></a><h3>json_node_get_boolean ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_node_get_boolean (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Gets the boolean value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. If the node holds an
-integer or double value which is zero, <code class="literal">FALSE</code> is returned; otherwise <code class="literal">TRUE</code>
+integer or double value which is zero, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned; otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>
 is returned. If the node holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a> value or a value of another
-non-boolean type, <code class="literal">FALSE</code> is returned.</p>
+non-boolean type, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned.</p>
 <div class="refsect3">
 <a name="json-node-get-boolean.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1662,7 +1667,7 @@ non-boolean type, <code class="literal">FALSE</code> is returned.</p>
 <a name="json-node-set-double"></a><h3>json_node_set_double ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_node_set_double (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                      <em class="parameter"><code><span class="type">gdouble</span> value</code></em>);</pre>
+                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>);</pre>
 <p>Sets <em class="parameter"><code>value</code></em>
  as the double content of the <em class="parameter"><code>node</code></em>
 , replacing any existing
@@ -1694,10 +1699,10 @@ content.</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-get-double"></a><h3>json_node_get_double ()</h3>
-<pre class="programlisting"><span class="returnvalue">gdouble</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 json_node_get_double (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Gets the double value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. If the node holds an integer
-value, it is returned as a double. If the node holds a <code class="literal">FALSE</code> boolean value,
+value, it is returned as a double. If the node holds a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> boolean value,
 <code class="literal">0.0</code> is returned; otherwise a non-zero double is returned. If the node holds
 a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a> value or a value of another non-double type, <code class="literal">0.0</code> is
 returned.</p>
@@ -1726,7 +1731,7 @@ returned.</p>
 <a name="json-node-set-int"></a><h3>json_node_set_int ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_node_set_int (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                   <em class="parameter"><code><span class="type">gint64</span> value</code></em>);</pre>
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> value</code></em>);</pre>
 <p>Sets <em class="parameter"><code>value</code></em>
  as the integer content of the <em class="parameter"><code>node</code></em>
 , replacing any existing
@@ -1758,10 +1763,10 @@ content.</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-get-int"></a><h3>json_node_get_int ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 json_node_get_int (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Gets the integer value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. If the node holds a double
-value, its integer component is returned. If the node holds a <code class="literal">FALSE</code> boolean
+value, its integer component is returned. If the node holds a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> boolean
 value, <code class="literal">0</code> is returned; otherwise a non-zero integer is returned. If the
 node holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a> value or a value of another non-integer type,
 <code class="literal">0</code> is returned.</p>
@@ -1790,7 +1795,7 @@ node holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"
 <a name="json-node-set-string"></a><h3>json_node_set_string ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_node_set_string (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                      <em class="parameter"><code>const <span class="type">gchar</span> *value</code></em>);</pre>
+                      <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);</pre>
 <p>Sets <em class="parameter"><code>value</code></em>
  as the string content of the <em class="parameter"><code>node</code></em>
 , replacing any existing
@@ -1822,10 +1827,10 @@ content.</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-get-string"></a><h3>json_node_get_string ()</h3>
-<pre class="programlisting">const <span class="returnvalue">gchar</span> *
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_node_get_string (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Gets the string value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. If the node does not hold a
-string value, <code class="literal">NULL</code> is returned.</p>
+string value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned.</p>
 <div class="refsect3">
 <a name="json-node-get-string.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1850,10 +1855,10 @@ string value, <code class="literal">NULL</code> is returned.</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-dup-string"></a><h3>json_node_dup_string ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_node_dup_string (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Gets a copy of the string value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>. If the node does
-not hold a string value, <code class="literal">NULL</code> is returned.</p>
+not hold a string value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned.</p>
 <div class="refsect3">
 <a name="json-node-dup-string.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1872,7 +1877,7 @@ not hold a string value, <code class="literal">NULL</code> is returned.</p>
 <div class="refsect3">
 <a name="json-node-dup-string.returns"></a><h4>Returns</h4>
 <p> a newly allocated string
-containing a copy of the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> contents. Use <code class="function">g_free()</code> to free the
+containing a copy of the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> contents. Use <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a> to free the
 allocated resources. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p>
 </div>
@@ -1938,7 +1943,7 @@ json_node_get_parent (<em class="parameter"><code><a class="link" href="json-gli
 </div>
 <div class="refsect3">
 <a name="json-node-get-parent.returns"></a><h4>Returns</h4>
-<p> the parent node, or <code class="literal">NULL</code> if <em class="parameter"><code>node</code></em>
+<p> the parent node, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>node</code></em>
 is the root node. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p>
 </div>
@@ -1946,7 +1951,7 @@ is the root node. </p>
 <hr>
 <div class="refsect2">
 <a name="json-node-type-name"></a><h3>json_node_type_name ()</h3>
-<pre class="programlisting">const <span class="returnvalue">gchar</span> *
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_node_type_name (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Retrieves the user readable name of the data type contained by <em class="parameter"><code>node</code></em>
 .</p>
@@ -1974,9 +1979,9 @@ is owned by the node and should never be modified or freed</p>
 <hr>
 <div class="refsect2">
 <a name="json-node-get-value-type"></a><h3>json_node_get_value_type ()</h3>
-<pre class="programlisting"><span class="returnvalue">GType</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
 json_node_get_value_type (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
-<p>Returns the <span class="type">GType</span> of the payload of the node.</p>
+<p>Returns the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the payload of the node.</p>
 <div class="refsect3">
 <a name="json-node-get-value-type.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1994,7 +1999,7 @@ json_node_get_value_type (<em class="parameter"><code><a class="link" href="json
 </div>
 <div class="refsect3">
 <a name="json-node-get-value-type.returns"></a><h4>Returns</h4>
-<p> a <span class="type">GType</span> for the payload.</p>
+<p> a <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for the payload.</p>
 </div>
 <p class="since">Since: <a class="link" href="ix03.html#api-index-0.4">0.4</a></p>
 </div>
@@ -2029,11 +2034,11 @@ json_node_get_node_type (<em class="parameter"><code><a class="link" href="json-
 <hr>
 <div class="refsect2">
 <a name="json-node-is-null"></a><h3>json_node_is_null ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_node_is_null (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Checks whether <em class="parameter"><code>node</code></em>
  is a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a>.</p>
-<p>A <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a> node is not the same as a <code class="literal">NULL</code> <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>; a
+<p>A <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a> node is not the same as a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>; a
 <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a> represents a 'null' value in the JSON tree.</p>
 <div class="refsect3">
 <a name="json-node-is-null.parameters"></a><h4>Parameters</h4>
@@ -2052,15 +2057,15 @@ json_node_is_null (<em class="parameter"><code><a class="link" href="json-glib-J
 </div>
 <div class="refsect3">
 <a name="json-node-is-null.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the node is null</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the node is null</p>
 </div>
 <p class="since">Since: <a class="link" href="ix05.html#api-index-0.8">0.8</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-string-hash"></a><h3>json_string_hash ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
-json_string_hash (<em class="parameter"><code><span class="type">gconstpointer</span> key</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+json_string_hash (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> key</code></em>);</pre>
 <p>Calculate a hash value for the given <em class="parameter"><code>key</code></em>
  (a UTF-8 JSON string).</p>
 <p>Note: Member names are compared byte-wise, without applying any Unicode
@@ -2091,9 +2096,9 @@ standard (ECMA-404), but is assumed.</p>
 <hr>
 <div class="refsect2">
 <a name="json-string-equal"></a><h3>json_string_equal ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
-json_string_equal (<em class="parameter"><code><span class="type">gconstpointer</span> a</code></em>,
-                   <em class="parameter"><code><span class="type">gconstpointer</span> b</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+json_string_equal (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> a</code></em>,
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> b</code></em>);</pre>
 <p>Check whether <em class="parameter"><code>a</code></em>
  and <em class="parameter"><code>b</code></em>
  are equal UTF-8 JSON strings.</p>
@@ -2121,18 +2126,18 @@ json_string_equal (<em class="parameter"><code><span class="type">gconstpointer<
 </div>
 <div class="refsect3">
 <a name="json-string-equal.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if <em class="parameter"><code>a</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>a</code></em>
 and <em class="parameter"><code>b</code></em>
-are equal; <code class="literal">FALSE</code> otherwise</p>
+are equal; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-string-compare"></a><h3>json_string_compare ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint</span>
-json_string_compare (<em class="parameter"><code><span class="type">gconstpointer</span> a</code></em>,
-                     <em class="parameter"><code><span class="type">gconstpointer</span> b</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+json_string_compare (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> a</code></em>,
+                     <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> b</code></em>);</pre>
 <p>Check whether <em class="parameter"><code>a</code></em>
  and <em class="parameter"><code>b</code></em>
  are equal UTF-8 JSON strings and return an ordering
@@ -2230,6 +2235,6 @@ functions and never directly.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 86%
rename from doc/reference/html/json-glib-JSON-Object.html
rename to doc/html/json-glib-JSON-Object.html
index e1e1c02..1b25331 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="Data Types">
 <link rel="prev" href="json-glib-JSON-Array.html" title="JSON Array">
 <link rel="next" href="json-streams.html" title="Part III. Reading and writing">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-is-immutable" title="json_object_is_immutable ()">json_object_is_immutable</a> <span class="c_punctuation">()</span>
@@ -82,7 +82,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-hash" title="json_object_hash ()">json_object_hash</a> <span class="c_punctuation">()</span>
@@ -90,7 +90,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-equal" title="json_object_equal ()">json_object_equal</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-has-member" title="json_object_has_member ()">json_object_has_member</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GList</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-members" title="json_object_get_members ()">json_object_get_members</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GList</span> *
+<a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-values" title="json_object_get_values ()">json_object_get_values</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">guint</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-size" title="json_object_get_size ()">json_object_get_size</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-iter-next" title="json_object_iter_next ()">json_object_iter_next</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-boolean-member" title="json_object_get_boolean_member ()">json_object_get_boolean_member</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gdouble</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-double-member" title="json_object_get_double_member ()">json_object_get_double_member</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gint64</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-int-member" title="json_object_get_int_member ()">json_object_get_int_member</a> <span class="c_punctuation">()</span>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-null-member" title="json_object_get_null_member ()">json_object_get_null_member</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">gchar</span> *
+<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-JSON-Object.html#json-object-get-string-member" title="json_object_get_string_member ()">json_object_get_string_member</a> <span class="c_punctuation">()</span>
 </div>
 <div class="refsect1">
 <a name="json-glib-JSON-Object.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html">GBoxed</a>
     <span class="lineart">╰──</span> JsonObject
 </pre>
 </div>
 <div class="refsect1">
+<a name="json-glib-JSON-Object.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-JSON-Object.description"></a><h2>Description</h2>
 <p><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> is the representation of the object type inside JSON. It
 contains <a href="json-glib-JSON-Node.html#JsonNode-struct"><span class="type">JsonNodes</span></a>, which may contain fundamental types, arrays or other
@@ -448,7 +453,7 @@ recursively seal all members of the object too.</p>
 <hr>
 <div class="refsect2">
 <a name="json-object-is-immutable"></a><h3>json_object_is_immutable ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_object_is_immutable (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>);</pre>
 <p>Check whether the given <em class="parameter"><code>object</code></em>
  has been marked as immutable by calling
@@ -470,7 +475,7 @@ json_object_is_immutable (<em class="parameter"><code><a class="link" href="json
 </div>
 <div class="refsect3">
 <a name="json-object-is-immutable.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the <em class="parameter"><code>object</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the <em class="parameter"><code>object</code></em>
 is immutable</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
@@ -478,8 +483,8 @@ is immutable</p>
 <hr>
 <div class="refsect2">
 <a name="json-object-hash"></a><h3>json_object_hash ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
-json_object_hash (<em class="parameter"><code><span class="type">gconstpointer</span> key</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+json_object_hash (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> key</code></em>);</pre>
 <p>Calculate a hash value for the given <em class="parameter"><code>key</code></em>
  (a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>).</p>
 <p>The hash is calculated over the object and all its members, recursively. If
@@ -510,9 +515,9 @@ proportionally with the number of members in the object.</p>
 <hr>
 <div class="refsect2">
 <a name="json-object-equal"></a><h3>json_object_equal ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
-json_object_equal (<em class="parameter"><code><span class="type">gconstpointer</span> a</code></em>,
-                   <em class="parameter"><code><span class="type">gconstpointer</span> b</code></em>);</pre>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+json_object_equal (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> a</code></em>,
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> b</code></em>);</pre>
 <p>Check whether <em class="parameter"><code>a</code></em>
  and <em class="parameter"><code>b</code></em>
  are equal <a href="json-glib-JSON-Object.html#JsonObject-struct"><span class="type">JsonObjects</span></a>, meaning they have the same
@@ -541,9 +546,9 @@ set of members, and the values of corresponding members are equal.</p>
 </div>
 <div class="refsect3">
 <a name="json-object-equal.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if <em class="parameter"><code>a</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>a</code></em>
 and <em class="parameter"><code>b</code></em>
-are equal; <code class="literal">FALSE</code> otherwise</p>
+are equal; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
 </div>
@@ -552,7 +557,7 @@ are equal; <code class="literal">FALSE</code> otherwise</p>
 <a name="json-object-add-member"></a><h3>json_object_add_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_add_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
                         <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <div class="warning">
 <p><code class="literal">json_object_add_member</code> has been deprecated since version 0.8 and should not be used in newly-written code.</p>
@@ -599,7 +604,7 @@ The object will take ownership of the <a class="link" href="json-glib-JSON-Node.
 <a name="json-object-set-member"></a><h3>json_object_set_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
                         <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
 <p>Sets <em class="parameter"><code>node</code></em>
  as the value of <em class="parameter"><code>member_name</code></em>
@@ -643,9 +648,9 @@ member is added to <em class="parameter"><code>object</code></em>
 <hr>
 <div class="refsect2">
 <a name="json-object-has-member"></a><h3>json_object_has_member ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_object_has_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Checks whether <em class="parameter"><code>object</code></em>
  has a member named <em class="parameter"><code>member_name</code></em>
 .</p>
@@ -673,7 +678,7 @@ json_object_has_member (<em class="parameter"><code><a class="link" href="json-g
 </div>
 <div class="refsect3">
 <a name="json-object-has-member.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the JSON object has the requested member</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the JSON object has the requested member</p>
 </div>
 </div>
 <hr>
@@ -681,7 +686,7 @@ json_object_has_member (<em class="parameter"><code><a class="link" href="json-g
 <a name="json-object-get-member"></a><h3>json_object_get_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_object_get_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Retrieves the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> containing the value of <em class="parameter"><code>member_name</code></em>
  inside
 a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>.</p>
@@ -710,7 +715,7 @@ a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type
 <div class="refsect3">
 <a name="json-object-get-member.returns"></a><h4>Returns</h4>
 <p> a pointer to the node for the requested object
-member, or <code class="literal">NULL</code>. </p>
+member, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -719,7 +724,7 @@ member, or <code class="literal">NULL</code>. </p>
 <a name="json-object-dup-member"></a><h3>json_object_dup_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_object_dup_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                        <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Retrieves a copy of the <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> containing the value of <em class="parameter"><code>member_name</code></em>
 
 inside a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a></p>
@@ -748,7 +753,7 @@ inside a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span clas
 <div class="refsect3">
 <a name="json-object-dup-member.returns"></a><h4>Returns</h4>
 <p> a copy of the node for the requested
-object member or <code class="literal">NULL</code>. Use <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_node_unref ()"><code class="function">json_node_unref()</code></a> when done. </p>
+object member or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Use <a class="link" href="json-glib-JSON-Node.html#json-node-unref" title="json_node_unref ()"><code class="function">json_node_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix04.html#api-index-0.6">0.6</a></p>
@@ -756,7 +761,7 @@ object member or <code class="literal">NULL</code>. Use <a class="link" href="js
 <hr>
 <div class="refsect2">
 <a name="json-object-get-members"></a><h3>json_object_get_members ()</h3>
-<pre class="programlisting"><span class="returnvalue">GList</span> *
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
 json_object_get_members (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>);</pre>
 <p>Retrieves all the names of the members of a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>. You can
 obtain the value for each member using <a class="link" href="json-glib-JSON-Object.html#json-object-get-member" title="json_object_get_member ()"><code class="function">json_object_get_member()</code></a>.</p>
@@ -777,10 +782,10 @@ obtain the value for each member using <a class="link" href="json-glib-JSON-Obje
 </div>
 <div class="refsect3">
 <a name="json-object-get-members.returns"></a><h4>Returns</h4>
-<p> a <span class="type">GList</span>
+<p> a <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a>
 of member names. The content of the list is owned by the <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>
 and should never be modified or freed. When you have finished using
-the returned list, use <code class="function">g_list_free()</code> to free the resources it has
+the returned list, use <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"><code class="function">g_list_free()</code></a> to free the resources it has
 allocated. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
 </div>
@@ -788,7 +793,7 @@ allocated. </p>
 <hr>
 <div class="refsect2">
 <a name="json-object-get-values"></a><h3>json_object_get_values ()</h3>
-<pre class="programlisting"><span class="returnvalue">GList</span> *
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
 json_object_get_values (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>);</pre>
 <p>Retrieves all the values of the members of a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>.</p>
 <div class="refsect3">
@@ -808,17 +813,17 @@ json_object_get_values (<em class="parameter"><code><a class="link" href="json-g
 </div>
 <div class="refsect3">
 <a name="json-object-get-values.returns"></a><h4>Returns</h4>
-<p> a <span class="type">GList</span> of
+<p> a <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of
 <a href="json-glib-JSON-Node.html#JsonNode-struct"><span class="type">JsonNodes</span></a>. The content of the list is owned by the <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>
 and should never be modified or freed. When you have finished using the
-returned list, use <code class="function">g_list_free()</code> to free the resources it has allocated. </p>
+returned list, use <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"><code class="function">g_list_free()</code></a> to free the resources it has allocated. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> JsonNode][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-object-get-size"></a><h3>json_object_get_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 json_object_get_size (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>);</pre>
 <p>Retrieves the number of members of a <a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a>.</p>
 <div class="refsect3">
@@ -846,7 +851,7 @@ json_object_get_size (<em class="parameter"><code><a class="link" href="json-gli
 <a name="json-object-remove-member"></a><h3>json_object_remove_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_remove_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                           <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Removes <em class="parameter"><code>member_name</code></em>
  from <em class="parameter"><code>object</code></em>
 , freeing its allocated resources.</p>
@@ -878,9 +883,9 @@ json_object_remove_member (<em class="parameter"><code><a class="link" href="jso
 <a name="JsonObjectForeach"></a><h3>JsonObjectForeach ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*JsonObjectForeach<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                      <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
+                      <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
                       <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *member_node</code></em>,
-                      <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
+                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>The function to be passed to <a class="link" href="json-glib-JSON-Object.html#json-object-foreach-member" title="json_object_foreach_member ()"><code class="function">json_object_foreach_member()</code></a>. You
 should not add or remove members to and from <em class="parameter"><code>object</code></em>
  within
@@ -927,7 +932,7 @@ value</p></td>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_foreach_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
                             <em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObjectForeach" title="JsonObjectForeach ()"><span class="type">JsonObjectForeach</span></a> func</code></em>,
-                            <em class="parameter"><code><span class="type">gpointer</span> data</code></em>);</pre>
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>);</pre>
 <p>Iterates over all members of <em class="parameter"><code>object</code></em>
  and calls <em class="parameter"><code>func</code></em>
  on
@@ -1031,13 +1036,13 @@ json_object_iter_init (<em class="parameter"><code><a class="link" href="json-gl
 <hr>
 <div class="refsect2">
 <a name="json-object-iter-next"></a><h3>json_object_iter_next ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_object_iter_next (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObjectIter" title="JsonObjectIter"><span class="type">JsonObjectIter</span></a> *iter</code></em>,
-                       <em class="parameter"><code>const <span class="type">gchar</span> **member_name</code></em>,
+                       <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> **member_name</code></em>,
                        <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> **member_node</code></em>);</pre>
 <p>Advance <em class="parameter"><code>iter</code></em>
  and retrieve the next member in the object. If the end of the
-object is reached, <code class="literal">FALSE</code> is returned and <em class="parameter"><code>member_name</code></em>
+object is reached, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned and <em class="parameter"><code>member_name</code></em>
  and <em class="parameter"><code>member_node</code></em>
  are
 set to invalid values. After that point, the <em class="parameter"><code>iter</code></em>
@@ -1061,13 +1066,13 @@ iterator is invalidated if its <a class="link" href="json-glib-JSON-Object.html#
 <tr>
 <td class="parameter_name"><p>member_name</p></td>
 <td class="parameter_description"><p> return
-location for the member name, or <code class="literal">NULL</code> to ignore. </p></td>
+location for the member name, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Out parameter, where caller must allocate storage."><span class="acronym">out callee-allocates</span></acronym>][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>member_node</p></td>
 <td class="parameter_description"><p> return
-location for the member value, or <code class="literal">NULL</code> to ignore. </p></td>
+location for the member value, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Out parameter, where caller must allocate storage."><span class="acronym">out callee-allocates</span></acronym>][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -1075,9 +1080,9 @@ location for the member value, or <code class="literal">NULL</code> to ignore. <
 </div>
 <div class="refsect3">
 <a name="json-object-iter-next.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if <em class="parameter"><code>member_name</code></em>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>member_name</code></em>
 and <em class="parameter"><code>member_node</code></em>
-are valid; <code class="literal">FALSE</code> if the end
+are valid; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if the end
 of the object has been reached</p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
@@ -1087,7 +1092,7 @@ of the object has been reached</p>
 <a name="json-object-set-array-member"></a><h3>json_object_set_array_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_array_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                              <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
+                              <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
                               <em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="type">JsonArray</span></a> *value</code></em>);</pre>
 <p>Convenience function for setting an array <em class="parameter"><code>value</code></em>
  of
@@ -1131,7 +1136,7 @@ json_object_set_array_member (<em class="parameter"><code><a class="link" href="
 <a name="json-object-get-array-member"></a><h3>json_object_get_array_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Array.html#JsonArray"><span class="returnvalue">JsonArray</span></a> *
 json_object_get_array_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                              <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                              <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function that retrieves the array
 stored in <em class="parameter"><code>member_name</code></em>
  of <em class="parameter"><code>object</code></em>
@@ -1171,8 +1176,8 @@ stored in <em class="parameter"><code>member_name</code></em>
 <a name="json-object-set-boolean-member"></a><h3>json_object_set_boolean_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_boolean_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                                <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
-                                <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);</pre>
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
 <p>Convenience function for setting a boolean <em class="parameter"><code>value</code></em>
  of
 <em class="parameter"><code>member_name</code></em>
@@ -1211,9 +1216,9 @@ json_object_set_boolean_member (<em class="parameter"><code><a class="link" href
 <hr>
 <div class="refsect2">
 <a name="json-object-get-boolean-member"></a><h3>json_object_get_boolean_member ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_object_get_boolean_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                                <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function that retrieves the boolean value
 stored in <em class="parameter"><code>member_name</code></em>
  of <em class="parameter"><code>object</code></em>
@@ -1252,8 +1257,8 @@ stored in <em class="parameter"><code>member_name</code></em>
 <a name="json-object-set-double-member"></a><h3>json_object_set_double_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_double_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
-                               <em class="parameter"><code><span class="type">gdouble</span> value</code></em>);</pre>
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>);</pre>
 <p>Convenience function for setting a floating point <em class="parameter"><code>value</code></em>
 
 of <em class="parameter"><code>member_name</code></em>
@@ -1292,9 +1297,9 @@ of <em class="parameter"><code>member_name</code></em>
 <hr>
 <div class="refsect2">
 <a name="json-object-get-double-member"></a><h3>json_object_get_double_member ()</h3>
-<pre class="programlisting"><span class="returnvalue">gdouble</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
 json_object_get_double_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function that retrieves the floating point value
 stored in <em class="parameter"><code>member_name</code></em>
  of <em class="parameter"><code>object</code></em>
@@ -1333,8 +1338,8 @@ stored in <em class="parameter"><code>member_name</code></em>
 <a name="json-object-set-int-member"></a><h3>json_object_set_int_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_int_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                            <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
-                            <em class="parameter"><code><span class="type">gint64</span> value</code></em>);</pre>
+                            <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> value</code></em>);</pre>
 <p>Convenience function for setting an integer <em class="parameter"><code>value</code></em>
  of
 <em class="parameter"><code>member_name</code></em>
@@ -1373,9 +1378,9 @@ json_object_set_int_member (<em class="parameter"><code><a class="link" href="js
 <hr>
 <div class="refsect2">
 <a name="json-object-get-int-member"></a><h3>json_object_get_int_member ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 json_object_get_int_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                            <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                            <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function that retrieves the integer value
 stored in <em class="parameter"><code>member_name</code></em>
  of <em class="parameter"><code>object</code></em>
@@ -1414,7 +1419,7 @@ stored in <em class="parameter"><code>member_name</code></em>
 <a name="json-object-set-null-member"></a><h3>json_object_set_null_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_null_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                             <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                             <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function for setting a null <em class="parameter"><code>value</code></em>
  of
 <em class="parameter"><code>member_name</code></em>
@@ -1448,9 +1453,9 @@ json_object_set_null_member (<em class="parameter"><code><a class="link" href="j
 <hr>
 <div class="refsect2">
 <a name="json-object-get-null-member"></a><h3>json_object_get_null_member ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_object_get_null_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                             <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                             <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function that checks whether the value
 stored in <em class="parameter"><code>member_name</code></em>
  of <em class="parameter"><code>object</code></em>
@@ -1480,7 +1485,7 @@ stored in <em class="parameter"><code>member_name</code></em>
 </div>
 <div class="refsect3">
 <a name="json-object-get-null-member.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the value is null</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the value is null</p>
 </div>
 <p class="since">Since: <a class="link" href="ix05.html#api-index-0.8">0.8</a></p>
 </div>
@@ -1489,7 +1494,7 @@ stored in <em class="parameter"><code>member_name</code></em>
 <a name="json-object-set-object-member"></a><h3>json_object_set_object_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_object_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
                                <em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *value</code></em>);</pre>
 <p>Convenience function for setting an object <em class="parameter"><code>value</code></em>
  of
@@ -1533,7 +1538,7 @@ json_object_set_object_member (<em class="parameter"><code><a class="link" href=
 <a name="json-object-get-object-member"></a><h3>json_object_get_object_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="returnvalue">JsonObject</span></a> *
 json_object_get_object_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function that retrieves the object
 stored in <em class="parameter"><code>member_name</code></em>
  of <em class="parameter"><code>object</code></em>
@@ -1566,7 +1571,7 @@ which does not exist.</p>
 <div class="refsect3">
 <a name="json-object-get-object-member.returns"></a><h4>Returns</h4>
 <p> the object inside the object’s
-member, or <code class="literal">NULL</code> if the value for the member is <code class="literal">null</code>. </p>
+member, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the value for the member is <code class="literal">null</code>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix05.html#api-index-0.8">0.8</a></p>
@@ -1576,8 +1581,8 @@ member, or <code class="literal">NULL</code> if the value for the member is <cod
 <a name="json-object-set-string-member"></a><h3>json_object_set_string_member ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_object_set_string_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *value</code></em>);</pre>
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>,
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *value</code></em>);</pre>
 <p>Convenience function for setting a string <em class="parameter"><code>value</code></em>
  of
 <em class="parameter"><code>member_name</code></em>
@@ -1616,9 +1621,9 @@ json_object_set_string_member (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="json-object-get-string-member"></a><h3>json_object_get_string_member ()</h3>
-<pre class="programlisting">const <span class="returnvalue">gchar</span> *
+<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 json_object_get_string_member (<em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject"><span class="type">JsonObject</span></a> *object</code></em>,
-                               <em class="parameter"><code>const <span class="type">gchar</span> *member_name</code></em>);</pre>
+                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *member_name</code></em>);</pre>
 <p>Convenience function that retrieves the string value
 stored in <em class="parameter"><code>member_name</code></em>
  of <em class="parameter"><code>object</code></em>
@@ -1678,6 +1683,6 @@ never be accessed directly.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
@@ -8,7 +8,7 @@
 <link rel="up" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="prev" href="json-glib-GObject-Serialization.html" title="GObject Serialization">
 <link rel="next" href="json-glib-Boxed-Types-Serialization.html" title="Boxed Types Serialization">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -50,7 +50,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-deserialize-property" title="json_serializable_deserialize_property ()">json_serializable_deserialize_property</a> <span class="c_punctuation">()</span>
@@ -58,7 +58,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GParamSpec</span> *
+<a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="returnvalue">GParamSpec</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-find-property" title="json_serializable_find_property ()">json_serializable_find_property</a> <span class="c_punctuation">()</span>
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">GParamSpec</span> **
+<a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="returnvalue">GParamSpec</span></a> **
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-list-properties" title="json_serializable_list_properties ()">json_serializable_list_properties</a> <span class="c_punctuation">()</span>
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">gboolean</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-default-deserialize-property" title="json_serializable_default_deserialize_property ()">json_serializable_default_deserialize_property</a> <span class="c_punctuation">()</span>
 </div>
 <div class="refsect1">
 <a name="json-glib-Serializable-Interface.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/GTypeModule.html">GInterface</a>
     <span class="lineart">╰──</span> JsonSerializable
 </pre>
 </div>
 <div class="refsect1">
+<a name="json-glib-Serializable-Interface.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-Serializable-Interface.description"></a><h2>Description</h2>
-<p><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> is an interface for <span class="type">GObject</span> classes that
+<p><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> is an interface for <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> classes that
 allows controlling how the class is going to be serialized
 or deserialized by <a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()"><code class="function">json_construct_gobject()</code></a> and
 <a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()"><code class="function">json_serialize_gobject()</code></a> respectively.</p>
@@ -139,10 +144,10 @@ or deserialized by <a class="link" href="json-glib-GObject-Serialization.html#js
 <a name="json-serializable-serialize-property"></a><h3>json_serializable_serialize_property ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_serializable_serialize_property (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
-                                      <em class="parameter"><code>const <span class="type">gchar</span> *property_name</code></em>,
-                                      <em class="parameter"><code>const <span class="type">GValue</span> *value</code></em>,
-                                      <em class="parameter"><code><span class="type">GParamSpec</span> *pspec</code></em>);</pre>
-<p>Asks a <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> implementation to serialize a <span class="type">GObject</span>
+                                      <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property_name</code></em>,
+                                      <em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                      <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> *pspec</code></em>);</pre>
+<p>Asks a <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> implementation to serialize a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a>
 property into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> object.</p>
 <div class="refsect3">
 <a name="json-serializable-serialize-property.parameters"></a><h4>Parameters</h4>
@@ -170,7 +175,7 @@ property into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span c
 </tr>
 <tr>
 <td class="parameter_name"><p>pspec</p></td>
-<td class="parameter_description"><p>a <span class="type">GParamSpec</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -184,12 +189,12 @@ property into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span c
 <hr>
 <div class="refsect2">
 <a name="json-serializable-deserialize-property"></a><h3>json_serializable_deserialize_property ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_serializable_deserialize_property
                                (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
-                                <em class="parameter"><code>const <span class="type">gchar</span> *property_name</code></em>,
-                                <em class="parameter"><code><span class="type">GValue</span> *value</code></em>,
-                                <em class="parameter"><code><span class="type">GParamSpec</span> *pspec</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property_name</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> *pspec</code></em>,
                                 <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *property_node</code></em>);</pre>
 <p>Asks a <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> implementation to deserialize the
 property contained inside <em class="parameter"><code>property_node</code></em>
@@ -216,12 +221,12 @@ property contained inside <em class="parameter"><code>property_node</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p> a pointer to an uninitialized <span class="type">GValue</span>. </p></td>
+<td class="parameter_description"><p> a pointer to an uninitialized <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>pspec</p></td>
-<td class="parameter_description"><p>a <span class="type">GParamSpec</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -234,13 +239,13 @@ property contained inside <em class="parameter"><code>property_node</code></em>
 </div>
 <div class="refsect3">
 <a name="json-serializable-deserialize-property.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the property was successfully deserialized.</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the property was successfully deserialized.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="json-serializable-find-property"></a><h3>json_serializable_find_property ()</h3>
-<pre class="programlisting"><span class="returnvalue">GParamSpec</span> *
+<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="returnvalue">GParamSpec</span></a> *
 json_serializable_find_property (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
                                  <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
 <p>Calls the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface.find-property"><code class="function">JsonSerializableIface.find_property()</code></a> implementation on
@@ -270,8 +275,8 @@ the <em class="parameter"><code>serializable</code></em>
 </div>
 <div class="refsect3">
 <a name="json-serializable-find-property.returns"></a><h4>Returns</h4>
-<p> the <span class="type">GParamSpec</span> for the property
-or <code class="literal">NULL</code> if no property was found. </p>
+<p> the <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> for the property
+or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no property was found. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
@@ -281,8 +286,8 @@ or <code class="literal">NULL</code> if no property was found. </p>
 <a name="json-serializable-get-property"></a><h3>json_serializable_get_property ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_serializable_get_property (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
-                                <em class="parameter"><code><span class="type">GParamSpec</span> *pspec</code></em>,
-                                <em class="parameter"><code><span class="type">GValue</span> *value</code></em>);</pre>
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> *pspec</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>Calls the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface.get-property"><code class="function">JsonSerializableIface.get_property()</code></a> implementation
 on the <em class="parameter"><code>serializable</code></em>
  instance.</p>
@@ -302,7 +307,7 @@ on the <em class="parameter"><code>serializable</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>pspec</p></td>
-<td class="parameter_description"><p>a <span class="type">GParamSpec</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -318,9 +323,9 @@ on the <em class="parameter"><code>serializable</code></em>
 <hr>
 <div class="refsect2">
 <a name="json-serializable-list-properties"></a><h3>json_serializable_list_properties ()</h3>
-<pre class="programlisting"><span class="returnvalue">GParamSpec</span> **
+<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="returnvalue">GParamSpec</span></a> **
 json_serializable_list_properties (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
-                                   <em class="parameter"><code><span class="type">guint</span> *n_pspecs</code></em>);</pre>
+                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *n_pspecs</code></em>);</pre>
 <p>Calls the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface.list-properties"><code class="function">JsonSerializableIface.list_properties()</code></a> implementation on
 the <em class="parameter"><code>serializable</code></em>
  instance.</p>
@@ -341,7 +346,7 @@ the <em class="parameter"><code>serializable</code></em>
 <tr>
 <td class="parameter_name"><p>n_pspecs</p></td>
 <td class="parameter_description"><p> return location for the length of the array
-of <span class="type">GParamSpec</span> returned by the function. </p></td>
+of <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> returned by the function. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -350,7 +355,7 @@ of <span class="type">GParamSpec</span> returned by the function. </p></td>
 <div class="refsect3">
 <a name="json-serializable-list-properties.returns"></a><h4>Returns</h4>
 <p> an array
-of <span class="type">GParamSpec</span>. Use <code class="function">g_free()</code> to free the array when done. </p>
+of <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a>. Use <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a> to free the array when done. </p>
 <p><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=n_pspecs][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix08.html#api-index-0.14">0.14</a></p>
@@ -360,8 +365,8 @@ of <span class="type">GParamSpec</span>. Use <code class="function">g_free()</co
 <a name="json-serializable-set-property"></a><h3>json_serializable_set_property ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 json_serializable_set_property (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
-                                <em class="parameter"><code><span class="type">GParamSpec</span> *pspec</code></em>,
-                                <em class="parameter"><code>const <span class="type">GValue</span> *value</code></em>);</pre>
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> *pspec</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
 <p>Calls the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface.set-property"><code class="function">JsonSerializableIface.set_property()</code></a> implementation
 on the <em class="parameter"><code>serializable</code></em>
  instance.</p>
@@ -381,7 +386,7 @@ on the <em class="parameter"><code>serializable</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>pspec</p></td>
-<td class="parameter_description"><p>a <span class="type">GParamSpec</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -400,15 +405,15 @@ on the <em class="parameter"><code>serializable</code></em>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_serializable_default_serialize_property
                                (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
-                                <em class="parameter"><code>const <span class="type">gchar</span> *property_name</code></em>,
-                                <em class="parameter"><code>const <span class="type">GValue</span> *value</code></em>,
-                                <em class="parameter"><code><span class="type">GParamSpec</span> *pspec</code></em>);</pre>
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property_name</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> *pspec</code></em>);</pre>
 <p>Calls the default implementation of the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a>
 <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface.serialize-property"><code class="function">JsonSerializableIface.serialize_property()</code></a> virtual function.</p>
 <p>This function can be used inside a custom implementation
 of the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface.serialize-property"><code class="function">JsonSerializableIface.serialize_property()</code></a> virtual
 function in lieu of calling the default implementation
-through <code class="function">g_type_default_interface_peek()</code>:</p>
+through <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-default-interface-peek"><code class="function">g_type_default_interface_peek()</code></a>:</p>
 <div class="informalexample">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
     <tbody>
@@ -423,7 +428,7 @@ through <code class="function">g_type_default_interface_peek()</code>:</p>
         <td class="listing_code"><pre class="programlisting"><span class="usertype">JsonSerializable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">iface</span><span class="symbol">;</span>
 <span class="usertype">JsonNode</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">node</span><span class="symbol">;</span>
 
-<span class="normal">iface </span><span class="symbol">=</span><span class="normal"> </span><span class="function">g_type_default_interface_peek</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">JSON_TYPE_SERIALIZABLE</span><span class="symbol">);</span>
+<span class="normal">iface </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-default-interface-peek">g_type_default_interface_peek</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">JSON_TYPE_SERIALIZABLE</span><span class="symbol">);</span>
 <span class="normal">node </span><span class="symbol">=</span><span class="normal"> iface</span><span class="symbol">-&gt;</span><span class="function">serialize_property</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">serializable</span><span class="symbol">,</span><span class="normal"> property_name</span><span class="symbol">,</span>
 <span class="normal">                                  value</span><span class="symbol">,</span>
 <span class="normal">                                  pspec</span><span class="symbol">);</span></pre></td>
@@ -459,7 +464,7 @@ through <code class="function">g_type_default_interface_peek()</code>:</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>pspec</p></td>
-<td class="parameter_description"><p>a <span class="type">GParamSpec</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -476,12 +481,12 @@ property. </p>
 <hr>
 <div class="refsect2">
 <a name="json-serializable-default-deserialize-property"></a><h3>json_serializable_default_deserialize_property ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 json_serializable_default_deserialize_property
                                (<em class="parameter"><code><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a> *serializable</code></em>,
-                                <em class="parameter"><code>const <span class="type">gchar</span> *property_name</code></em>,
-                                <em class="parameter"><code><span class="type">GValue</span> *value</code></em>,
-                                <em class="parameter"><code><span class="type">GParamSpec</span> *pspec</code></em>,
+                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property_name</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a> *pspec</code></em>,
                                 <em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *property_node</code></em>);</pre>
 <p>Calls the default implementation of the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializable"><span class="type">JsonSerializable</span></a>
 <code class="function">deserialize_property()</code> virtual function</p>
@@ -502,7 +507,7 @@ of the <code class="function">deserialize_property()</code> virtual function in
         <td class="listing_code"><pre class="programlisting"><span class="usertype">JsonSerializable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">iface</span><span class="symbol">;</span>
 <span class="usertype">gboolean</span><span class="normal"> res</span><span class="symbol">;</span>
 
-<span class="normal">iface </span><span class="symbol">=</span><span class="normal"> </span><span class="function">g_type_default_interface_peek</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">JSON_TYPE_SERIALIZABLE</span><span class="symbol">);</span>
+<span class="normal">iface </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-default-interface-peek">g_type_default_interface_peek</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">JSON_TYPE_SERIALIZABLE</span><span class="symbol">);</span>
 <span class="normal">res </span><span class="symbol">=</span><span class="normal"> iface</span><span class="symbol">-&gt;</span><span class="function">deserialize_property</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">serializable</span><span class="symbol">,</span><span class="normal"> property_name</span><span class="symbol">,</span>
 <span class="normal">                                   value</span><span class="symbol">,</span>
 <span class="normal">                                   pspec</span><span class="symbol">,</span>
@@ -534,12 +539,12 @@ of the <code class="function">deserialize_property()</code> virtual function in
 </tr>
 <tr>
 <td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>a pointer to an uninitialized <span class="type">GValue</span></p></td>
+<td class="parameter_description"><p>a pointer to an uninitialized <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>pspec</p></td>
-<td class="parameter_description"><p>a <span class="type">GParamSpec</span></p></td>
+<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamSpec"><span class="type">GParamSpec</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -552,7 +557,7 @@ of the <code class="function">deserialize_property()</code> virtual function in
 </div>
 <div class="refsect3">
 <a name="json-serializable-default-deserialize-property.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if the property was successfully deserialized.</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the property was successfully deserialized.</p>
 </div>
 <p class="since">Since: <a class="link" href="ix06.html#api-index-0.10">0.10</a></p>
 </div>
@@ -584,9 +589,9 @@ of the <code class="function">deserialize_property()</code> virtual function in
                                         GValue           *value);
 };
 </pre>
-<p>Interface that allows serializing and deserializing <span class="type">GObject</span> instances
+<p>Interface that allows serializing and deserializing <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> instances
 with properties storing complex data types. The <a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()"><code class="function">json_serialize_gobject()</code></a>
-function will check if the passed <span class="type">GObject</span> implements this interface,
+function will check if the passed <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> implements this interface,
 so it can also be used to override the default property serialization
 sequence.</p>
 <div class="refsect3">
@@ -600,14 +605,14 @@ sequence.</p>
 <tbody>
 <tr>
 <td class="struct_member_name"><p><em class="structfield"><code><a name="JsonSerializableIface.serialize-property"></a>serialize_property</code></em> ()</p></td>
-<td class="struct_member_description"><p>virtual function for serializing a <span class="type">GObject</span> property
+<td class="struct_member_description"><p>virtual function for serializing a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> property
 into a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
 <td class="struct_member_name"><p><em class="structfield"><code><a name="JsonSerializableIface.deserialize-property"></a>deserialize_property</code></em> ()</p></td>
 <td class="struct_member_description"><p>virtual function for deserializing a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>
-into a <span class="type">GObject</span> property</p></td>
+into a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> property</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
@@ -639,6 +644,6 @@ definitions</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 84%
rename from doc/reference/html/json-glib-Utility-API.html
rename to doc/html/json-glib-Utility-API.html
index 3b67d3a..7a7f54d 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="General Purpose API">
 <link rel="prev" href="ch04.html" title="General Purpose API">
 <link rel="next" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 </table></div>
 </div>
 <div class="refsect1">
+<a name="json-glib-Utility-API.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-Utility-API.description"></a><h2>Description</h2>
 <p>Various utility functions.</p>
 </div>
 <a name="json-from-string"></a><h3>json_from_string ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="returnvalue">JsonNode</span></a> *
 json_from_string (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
-                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Parses the string in <em class="parameter"><code>str</code></em>
  and returns a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> representing
 the JSON tree.</p>
-<p>In case of parsing error, this function returns <code class="literal">NULL</code> and sets
+<p>In case of parsing error, this function returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> and sets
 <em class="parameter"><code>error</code></em>
  appropriately.</p>
 <div class="refsect3">
@@ -91,7 +96,7 @@ the JSON tree.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <span class="type">GError</span></p></td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -99,7 +104,7 @@ the JSON tree.</p>
 </div>
 <div class="refsect3">
 <a name="json-from-string.returns"></a><h4>Returns</h4>
-<p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <code class="literal">NULL</code>. </p>
+<p> a <a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="ix11.html#api-index-1.2">1.2</a></p>
@@ -109,7 +114,7 @@ the JSON tree.</p>
 <a name="json-to-string"></a><h3>json_to_string ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *
 json_to_string (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
-                <em class="parameter"><code><span class="type">gboolean</span> pretty</code></em>);</pre>
+                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> pretty</code></em>);</pre>
 <p>Generates a stringified JSON representation of the contents of
 the passed <em class="parameter"><code>node</code></em>
 .</p>
@@ -148,6 +153,6 @@ the passed <em class="parameter"><code>node</code></em>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
@@ -8,7 +8,7 @@
 <link rel="up" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="prev" href="json-glib-JSON-GVariant-Integration.html" title="JSON GVariant Integration">
 <link rel="next" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 </table></div>
 </div>
 <div class="refsect1">
+<a name="json-glib-Versioning-information.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;json-glib/json-glib.h&gt;
+</pre>
+</div>
+<div class="refsect1">
 <a name="json-glib-Versioning-information.description"></a><h2>Description</h2>
 <p>JSON-GLib provides macros to check the version of the library
 at compile-time</p>
@@ -99,7 +104,7 @@ at compile-time</p>
 <div class="refsect2">
 <a name="JSON-CHECK-VERSION:CAPS"></a><h3>JSON_CHECK_VERSION()</h3>
 <pre class="programlisting">#define             JSON_CHECK_VERSION(major,minor,micro)</pre>
-<p>Compile-time version checking. Evaluates to <code class="literal">TRUE</code> if the version
+<p>Compile-time version checking. Evaluates to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the version
 of Json is greater than the required one.</p>
 <div class="refsect3">
 <a name="JSON-CHECK-VERSION.parameters"></a><h4>Parameters</h4>
@@ -134,35 +139,35 @@ of Json is greater than the required one.</p>
 <a name="json-glib-Versioning-information.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
 <a name="JSON-MAJOR-VERSION:CAPS"></a><h3>JSON_MAJOR_VERSION</h3>
-<pre class="programlisting">#define JSON_MAJOR_VERSION              (1)
+<pre class="programlisting">#define JSON_MAJOR_VERSION
 </pre>
 <p>Json major version component (e.g. 1 if <a class="link" href="json-glib-Versioning-information.html#JSON-VERSION:CAPS" title="JSON_VERSION"><code class="literal">JSON_VERSION</code></a> is 1.2.3)</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JSON-MINOR-VERSION:CAPS"></a><h3>JSON_MINOR_VERSION</h3>
-<pre class="programlisting">#define JSON_MINOR_VERSION              (2)
+<pre class="programlisting">#define JSON_MINOR_VERSION
 </pre>
 <p>Json minor version component (e.g. 2 if <a class="link" href="json-glib-Versioning-information.html#JSON-VERSION:CAPS" title="JSON_VERSION"><code class="literal">JSON_VERSION</code></a> is 1.2.3)</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JSON-MICRO-VERSION:CAPS"></a><h3>JSON_MICRO_VERSION</h3>
-<pre class="programlisting">#define JSON_MICRO_VERSION              (6)
+<pre class="programlisting">#define JSON_MICRO_VERSION
 </pre>
 <p>Json micro version component (e.g. 3 if <a class="link" href="json-glib-Versioning-information.html#JSON-VERSION:CAPS" title="JSON_VERSION"><code class="literal">JSON_VERSION</code></a> is 1.2.3)</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JSON-VERSION:CAPS"></a><h3>JSON_VERSION</h3>
-<pre class="programlisting">#define JSON_VERSION                    (1.2.6)
+<pre class="programlisting">#define JSON_VERSION                    (1.2.8)
 </pre>
 <p>Json version.</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="JSON-VERSION-S:CAPS"></a><h3>JSON_VERSION_S</h3>
-<pre class="programlisting">#define JSON_VERSION_S                  "1.2.6"
+<pre class="programlisting">#define JSON_VERSION_S                  "1.2.8"
 </pre>
 <p>JSON-GLib version, encoded as a string, useful for printing and
 concatenation.</p>
@@ -207,6 +212,6 @@ trying to use that function.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 99%
rename from doc/reference/html/json-glib.devhelp2
rename to doc/html/json-glib.devhelp2
index b7877ba..cfee527 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <book xmlns="http://www.devhelp.net/book" title="JSON-GLib Reference Manual" link="index.html" author="" name="json-glib" version="2" language="c">
   <chapters>
-    <sub name="JSON-GLib Overview" link="json-glib.html"/>
+    <sub name="JSON-GLib Overview" link="json-overview.html"/>
     <sub name="JSON-GLib Reference" link="json-base.html">
       <sub name="Data Types" link="ch01.html">
         <sub name="JSON Node" link="json-glib-JSON-Node.html"/>
similarity index 80%
rename from doc/reference/html/json-glib.html
rename to doc/html/json-overview.html
index 0db9847..d10d1e4 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="next" href="json-base.html" title="Part II. JSON-GLib Reference">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="json-glib"></a>Part I. JSON-GLib Overview</h1></div></div></div>
+<a name="json-overview"></a>Part I. JSON-GLib Overview</h1></div></div></div>
 <div class="partintro">
 <div></div>
 <p>
     and writing of JSON (JavaScript Object Notation) streams, using GLib's
     data types and API.
     </p>
+<p>
+    JSON (JavaScript Object Notation) is a lightweight data-interchange
+    format. More information on the grammar is <a class="ulink" href="http://json.org" target="_top">available on json.org</a>.
+    </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 96%
rename from doc/reference/html/json-streams.html
rename to doc/html/json-streams.html
index ac7bcb4..81c23ba 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="json-glib-JSON-Object.html" title="JSON Object">
 <link rel="next" href="ch02.html" title="Parser">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -61,6 +61,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 95%
rename from doc/reference/html/json-tools.html
rename to doc/html/json-tools.html
index 41c4b42..479e7d1 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="json-glib-Versioning-information.html" title="Versioning information">
 <link rel="next" href="tools.html" title="JSON-GLib Tools">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,6 +39,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 96%
rename from doc/reference/html/json-validate-tool.html
rename to doc/html/json-validate-tool.html
index aee58a5..ac4f66c 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="tools.html" title="JSON-GLib Tools">
 <link rel="prev" href="json-format-tool.html" title="json-glib-format">
 <link rel="next" href="ch06.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -66,6 +66,6 @@ Prints help and exits.
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 96%
rename from doc/reference/html/license.html
rename to doc/html/license.html
index 4bff4c3..8a8ff91 100644 (file)
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -52,6 +52,6 @@
     </p>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 94%
rename from doc/reference/html/tools.html
rename to doc/html/tools.html
index b8c328a..f9cc175 100644 (file)
@@ -8,7 +8,7 @@
 <link rel="up" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
 <link rel="prev" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
 <link rel="next" href="json-format-tool.html" title="json-glib-format">
-<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,6 +32,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25.1</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
similarity index 100%
rename from doc/reference/html/up.png
rename to doc/html/up.png
similarity index 87%
rename from doc/reference/json-glib-docs.xml
rename to doc/json-glib-docs.xml
index 71782cd..88cbc3c 100644 (file)
@@ -9,8 +9,19 @@
 
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>JSON-GLib Reference Manual</title>
-    <releaseinfo>for JSON-GLib &package_version;</releaseinfo>
+    <title>&package_name; Reference Manual</title>
+    <releaseinfo>
+      <para>This document is the API reference for for &package_name; &package_version;.</para>
+      <para>
+        The latest version of this API reference is also available
+        <ulink role="online-location" url="https://developer.gnome.org/json-glib/">online</ulink>.
+      </para>
+      <para>
+        If you find any issues in this API reference, please report it
+        using <ulink type="http" url="&package_bugreport;">the online
+        bug reporting tool</ulink> at bugzilla.gnome.org.
+      </para>
+    </releaseinfo>
 
     <copyright>
       <year>2007, 2008</year>
@@ -46,7 +57,7 @@
 
     </bookinfo>
 
-  <part id="json-glib">
+  <part id="json-overview">
     <title>JSON-GLib Overview</title>
 
     <partintro>
     data types and API.
     </para>
 
+    <para>
+    JSON (JavaScript Object Notation) is a lightweight data-interchange
+    format. More information on the grammar is <ulink type="http"
+    url="http://json.org">available on json.org</ulink>.
+    </para>
+
     </partintro>
 
   </part>
     <title>JSON-GLib Additional Reference</title>
 
     <chapter id="tools">
-        <title>JSON-GLib Tools</title>
-        <xi:include href="json-glib-format.xml"/>
-        <xi:include href="json-glib-validate.xml"/>
+      <title>JSON-GLib Tools</title>
+      <xi:include href="json-glib-format.xml"/>
+      <xi:include href="json-glib-validate.xml"/>
     </chapter>
 
     <chapter>
similarity index 98%
rename from doc/reference/json-glib-format.1
rename to doc/json-glib-format.1
index 4bdfd16..f8eebf4 100644 (file)
@@ -2,7 +2,7 @@
 .\"     Title: json-glib-format
 .\"    Author: Emmanuele Bassi
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/13/2017
+.\"      Date: 03/18/2017
 .\"    Manual: User Commands
 .\"    Source: JSON-GLib
 .\"  Language: English
diff --git a/doc/json-glib-overrides.txt b/doc/json-glib-overrides.txt
new file mode 100644 (file)
index 0000000..68de4f0
--- /dev/null
@@ -0,0 +1,14 @@
+<MACRO>
+<NAME>JSON_MAJOR_VERSION</NAME>
+#define JSON_MAJOR_VERSION
+</MACRO>
+
+<MACRO>
+<NAME>JSON_MINOR_VERSION</NAME>
+#define JSON_MINOR_VERSION
+</MACRO>
+
+<MACRO>
+<NAME>JSON_MICRO_VERSION</NAME>
+#define JSON_MICRO_VERSION
+</MACRO>
similarity index 99%
rename from doc/reference/json-glib-sections.txt
rename to doc/json-glib-sections.txt
index 4f1e471..970770a 100644 (file)
@@ -1,3 +1,5 @@
+<INCLUDE>json-glib/json-glib.h</INCLUDE>
+
 <SECTION>
 <FILE>json-object</FILE>
 <TITLE>JSON Object</TITLE>
similarity index 98%
rename from doc/reference/json-glib-validate.1
rename to doc/json-glib-validate.1
index 6a66457..f951f77 100644 (file)
@@ -2,7 +2,7 @@
 .\"     Title: json-glib-validate
 .\"    Author: Emmanuele Bassi
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/13/2017
+.\"      Date: 03/18/2017
 .\"    Manual: User Commands
 .\"    Source: JSON-GLib
 .\"  Language: English
similarity index 99%
rename from doc/reference/meson.build
rename to doc/meson.build
index 0aaa709..238b840 100644 (file)
@@ -1,6 +1,8 @@
 subdir('xml')
 
 private_headers = [
+  'config.h',
+
   'json-debug.h',
   'json-enum-types.h',
   'json-glib.h',
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
deleted file mode 100644 (file)
index 9650ce0..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-DOC_MODULE = json-glib
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
-DOC_SOURCE_DIR = $(top_srcdir)/json-glib $(top_builddir)/json-glib
-
-SCANGOBJ_OPTIONS =
-SCAN_OPTIONS = --deprecated-guards="JSON_DISABLE_DEPRECATED" --rebuild-types
-MKDB_OPTIONS = --output-format=xml --name-space=json
-MKTMPL_OPTIONS =
-FIXXREF_OPTIONS = \
-       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
-
-HFILE_GLOB = $(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
-CFILE_GLOB = $(top_srcdir)/json-glib/*.c
-
-IGNORE_HFILES = \
-       json-scanner.h          \
-       json-types-private.h    \
-       json-gobject-private.h  \
-       json-private.h          \
-       json-marshal.h          \
-       json-glib.h             \
-       json-enum-types.h       \
-       json-debug.h
-
-EXTRA_HFILES =
-
-HTML_IMAGES =
-
-content_files = \
-       json-glib-format.xml \
-       json-glib-validate.xml \
-       version.xml
-
-expand_content_files =
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
-
-include $(top_srcdir)/gtk-doc.make
-
-EXTRA_DIST += version.xml.in
-
-man_MANS =
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = \
-       DOC_MODULE=$(DOC_MODULE) \
-       DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-       SRCDIR=$(abs_srcdir) \
-       BUILDDIR=$(abs_builddir)
-
-TESTS = $(GTKDOC_CHECK)
-endif
-
-if ENABLE_MAN
-man_MANS += \
-       json-glib-format.1 \
-       json-glib-validate.1
-
-XSLTPROC_FLAGS = \
-       --nonet \
-       --stringparam man.output.quietly 1 \
-       --stringparam funcsynopsis.style ansi \
-       --stringparam man.th.extra1.suppress 1 \
-       --stringparam man.authors.section.enabled 0 \
-       --stringparam man.copyright.section.enabled 0
-
-.xml.1:
-       $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-endif
-
-CLEANFILES ?=
-CLEANFILES += $(man_MANS)
-EXTRA_DIST += $(man_MANS)
diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in
deleted file mode 100644 (file)
index d009f87..0000000
+++ /dev/null
@@ -1,1277 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \  ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@ENABLE_MAN_TRUE@am__append_1 = \
-@ENABLE_MAN_TRUE@      json-glib-format.1 \
-@ENABLE_MAN_TRUE@      json-glib-validate.1
-
-subdir = doc/reference
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-       $(top_srcdir)/build/autotools/as-compiler-flag.m4 \
-       $(top_srcdir)/build/autotools/as-linguas.m4 \
-       $(top_srcdir)/build/autotools/gettext.m4 \
-       $(top_srcdir)/build/autotools/glibtests.m4 \
-       $(top_srcdir)/build/autotools/gtk-doc.m4 \
-       $(top_srcdir)/build/autotools/iconv.m4 \
-       $(top_srcdir)/build/autotools/intlmacosx.m4 \
-       $(top_srcdir)/build/autotools/introspection.m4 \
-       $(top_srcdir)/build/autotools/jh-catalog.m4 \
-       $(top_srcdir)/build/autotools/lib-ld.m4 \
-       $(top_srcdir)/build/autotools/lib-link.m4 \
-       $(top_srcdir)/build/autotools/lib-prefix.m4 \
-       $(top_srcdir)/build/autotools/libtool.m4 \
-       $(top_srcdir)/build/autotools/ltoptions.m4 \
-       $(top_srcdir)/build/autotools/ltsugar.m4 \
-       $(top_srcdir)/build/autotools/ltversion.m4 \
-       $(top_srcdir)/build/autotools/lt~obsolete.m4 \
-       $(top_srcdir)/build/autotools/nls.m4 \
-       $(top_srcdir)/build/autotools/po.m4 \
-       $(top_srcdir)/build/autotools/progtest.m4 \
-       $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = version.xml
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)"
-NROFF = nroff
-MANS = $(man_MANS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='\e[0;31m'; \
-    grn='\e[0;32m'; \
-    lgn='\e[1;32m'; \
-    blu='\e[1;34m'; \
-    mgn='\e[0;35m'; \
-    brg='\e[1m'; \
-    std='\e[m'; \
-  fi; \
-}
-am__recheck_rx = ^[    ]*:recheck:[    ]*
-am__global_test_result_rx = ^[         ]*:global-test-result:[         ]*
-am__copy_in_global_log_rx = ^[         ]*:copy-in-global-log:[         ]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-           recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[       ]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);                                     \
-$(am__vpath_adj_setup) $(am__vpath_adj)                        \
-$(am__tty_colors);                                     \
-srcdir=$(srcdir); export srcdir;                       \
-case "$@" in                                           \
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;   \
-    *) am__odir=.;;                                    \
-esac;                                                  \
-test "x$$am__odir" = x"." || test -d "$$am__odir"      \
-  || $(MKDIR_P) "$$am__odir" || exit $$?;              \
-if test -f "./$$f"; then dir=./;                       \
-elif test -f "$$f"; then dir=;                         \
-else dir="$(srcdir)/"; fi;                             \
-tst=$$dir$$f; log='$@';                                \
-if test -n '$(DISABLE_HARD_ERRORS)'; then              \
-  am__enable_hard_errors=no;                           \
-else                                                   \
-  am__enable_hard_errors=yes;                          \
-fi;                                                    \
-case " $(XFAIL_TESTS) " in                             \
-  *[\ \        ]$$f[\ \        ]* | *[\ \      ]$$dir$$f[\ \   ]*) \
-    am__expect_failure=yes;;                           \
-  *)                                                   \
-    am__expect_failure=no;;                            \
-esac;                                                  \
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-       $(TEST_LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \
-       $(top_srcdir)/build/test-driver $(top_srcdir)/gtk-doc.make
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_PREFIX = @GLIB_PREFIX@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-JSON_CFLAGS = @JSON_CFLAGS@
-JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@
-JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@
-JSON_GCOV_LDADD = @JSON_GCOV_LDADD@
-JSON_HIDDEN_VISIBILITY_CFLAGS = @JSON_HIDDEN_VISIBILITY_CFLAGS@
-JSON_LIBS = @JSON_LIBS@
-JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@
-JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
-JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
-JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
-JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
-JSON_VERSION = @JSON_VERSION@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LTP = @LTP@
-LTP_GENHTML = @LTP_GENHTML@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHTOOL = @SHTOOL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLCATALOG = @XMLCATALOG@
-XML_CATALOG_FILE = @XML_CATALOG_FILE@
-XSLTPROC = @XSLTPROC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-installed_test_metadir = @installed_test_metadir@
-installed_testdir = @installed_testdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DOC_MODULE = json-glib
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
-DOC_SOURCE_DIR = $(top_srcdir)/json-glib $(top_builddir)/json-glib
-SCANGOBJ_OPTIONS = 
-SCAN_OPTIONS = --deprecated-guards="JSON_DISABLE_DEPRECATED" --rebuild-types
-MKDB_OPTIONS = --output-format=xml --name-space=json
-MKTMPL_OPTIONS = 
-FIXXREF_OPTIONS = \
-       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
-
-HFILE_GLOB = $(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
-CFILE_GLOB = $(top_srcdir)/json-glib/*.c
-IGNORE_HFILES = \
-       json-scanner.h          \
-       json-types-private.h    \
-       json-gobject-private.h  \
-       json-private.h          \
-       json-marshal.h          \
-       json-glib.h             \
-       json-enum-types.h       \
-       json-debug.h
-
-EXTRA_HFILES = 
-HTML_IMAGES = 
-content_files = \
-       json-glib-format.xml \
-       json-glib-validate.xml \
-       version.xml
-
-expand_content_files = 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = 
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-SETUP_FILES = \
-       $(content_files)                \
-       $(expand_content_files)         \
-       $(DOC_MAIN_SGML_FILE)           \
-       $(DOC_MODULE)-sections.txt      \
-       $(DOC_MODULE)-overrides.txt
-
-EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in $(man_MANS)
-DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
-       html-build.stamp pdf-build.stamp \
-       sgml.stamp html.stamp pdf.stamp
-
-SCANOBJ_FILES = \
-       $(DOC_MODULE).args       \
-       $(DOC_MODULE).hierarchy  \
-       $(DOC_MODULE).interfaces \
-       $(DOC_MODULE).prerequisites \
-       $(DOC_MODULE).signals
-
-REPORT_FILES = \
-       $(DOC_MODULE)-undocumented.txt \
-       $(DOC_MODULE)-undeclared.txt \
-       $(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
-       gtkdoc-check.test $(man_MANS)
-@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
-@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
-@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
-@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
-
-#### setup ####
-GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
-GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
-
-#### scan ####
-GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
-GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
-GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
-GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
-
-#### xml ####
-GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
-GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
-
-#### html ####
-GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
-GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
-GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
-GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
-
-#### pdf ####
-GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
-GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
-man_MANS = $(am__append_1)
-@ENABLE_GTK_DOC_TRUE@TESTS_ENVIRONMENT = \
-@ENABLE_GTK_DOC_TRUE@  DOC_MODULE=$(DOC_MODULE) \
-@ENABLE_GTK_DOC_TRUE@  DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-@ENABLE_GTK_DOC_TRUE@  SRCDIR=$(abs_srcdir) \
-@ENABLE_GTK_DOC_TRUE@  BUILDDIR=$(abs_builddir)
-
-@ENABLE_GTK_DOC_TRUE@TESTS = $(GTKDOC_CHECK)
-@ENABLE_MAN_TRUE@XSLTPROC_FLAGS = \
-@ENABLE_MAN_TRUE@      --nonet \
-@ENABLE_MAN_TRUE@      --stringparam man.output.quietly 1 \
-@ENABLE_MAN_TRUE@      --stringparam funcsynopsis.style ansi \
-@ENABLE_MAN_TRUE@      --stringparam man.th.extra1.suppress 1 \
-@ENABLE_MAN_TRUE@      --stringparam man.authors.section.enabled 0 \
-@ENABLE_MAN_TRUE@      --stringparam man.copyright.section.enabled 0
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .1 .log .test .test$(EXEEXT) .trs .xml
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/reference/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign doc/reference/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-$(top_srcdir)/gtk-doc.make $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-install-man1: $(man_MANS)
-       @$(NORMAL_INSTALL)
-       @list1=''; \
-       list2='$(man_MANS)'; \
-       test -n "$(man1dir)" \
-         && test -n "`echo $$list1$$list2`" \
-         || exit 0; \
-       echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-       $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-       { for i in $$list1; do echo "$$i"; done;  \
-       if test -n "$$list2"; then \
-         for i in $$list2; do echo "$$i"; done \
-           | sed -n '/\.1[a-z]*$$/p'; \
-       fi; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man1:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man1dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.1[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-       rm -f $< $@
-       $(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-       @:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-       @$(am__set_TESTS_bases); \
-       am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-       redo_bases=`for i in $$bases; do \
-                     am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-                   done`; \
-       if test -n "$$redo_bases"; then \
-         redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-         redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-         if $(am__make_dryrun); then :; else \
-           rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-         fi; \
-       fi; \
-       if test -n "$$am__remaking_logs"; then \
-         echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-              "recursion detected" >&2; \
-       elif test -n "$$redo_logs"; then \
-         am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-       fi; \
-       if $(am__make_dryrun); then :; else \
-         st=0;  \
-         errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-         for i in $$redo_bases; do \
-           test -f $$i.trs && test -r $$i.trs \
-             || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-           test -f $$i.log && test -r $$i.log \
-             || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-         done; \
-         test $$st -eq 0 || exit 1; \
-       fi
-       @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-       ws='[   ]'; \
-       results=`for b in $$bases; do echo $$b.trs; done`; \
-       test -n "$$results" || results=/dev/null; \
-       all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-       pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-       fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-       skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-       xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-       xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-       error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-       if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-         success=true; \
-       else \
-         success=false; \
-       fi; \
-       br='==================='; br=$$br$$br$$br$$br; \
-       result_count () \
-       { \
-           if test x"$$1" = x"--maybe-color"; then \
-             maybe_colorize=yes; \
-           elif test x"$$1" = x"--no-color"; then \
-             maybe_colorize=no; \
-           else \
-             echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-           fi; \
-           shift; \
-           desc=$$1 count=$$2; \
-           if test $$maybe_colorize = yes && test $$count -gt 0; then \
-             color_start=$$3 color_end=$$std; \
-           else \
-             color_start= color_end=; \
-           fi; \
-           echo "$${color_start}# $$desc $$count$${color_end}"; \
-       }; \
-       create_testsuite_report () \
-       { \
-         result_count $$1 "TOTAL:" $$all   "$$brg"; \
-         result_count $$1 "PASS: " $$pass  "$$grn"; \
-         result_count $$1 "SKIP: " $$skip  "$$blu"; \
-         result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-         result_count $$1 "FAIL: " $$fail  "$$red"; \
-         result_count $$1 "XPASS:" $$xpass "$$red"; \
-         result_count $$1 "ERROR:" $$error "$$mgn"; \
-       }; \
-       {                                                               \
-         echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |       \
-           $(am__rst_title);                                           \
-         create_testsuite_report --no-color;                           \
-         echo;                                                         \
-         echo ".. contents:: :depth: 2";                               \
-         echo;                                                         \
-         for b in $$bases; do echo $$b; done                           \
-           | $(am__create_global_log);                                 \
-       } >$(TEST_SUITE_LOG).tmp || exit 1;                             \
-       mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);                     \
-       if $$success; then                                              \
-         col="$$grn";                                                  \
-        else                                                           \
-         col="$$red";                                                  \
-         test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);               \
-       fi;                                                             \
-       echo "$${col}$$br$${std}";                                      \
-       echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";   \
-       echo "$${col}$$br$${std}";                                      \
-       create_testsuite_report --maybe-color;                          \
-       echo "$$col$$br$$std";                                          \
-       if $$success; then :; else                                      \
-         echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";         \
-         if test -n "$(PACKAGE_BUGREPORT)"; then                       \
-           echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
-         fi;                                                           \
-         echo "$$col$$br$$std";                                        \
-       fi;                                                             \
-       $$success || exit 1
-
-check-TESTS:
-       @list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-       @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-       @set +e; $(am__set_TESTS_bases); \
-       log_list=`for i in $$bases; do echo $$i.log; done`; \
-       trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-       log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-       exit $$?;
-recheck: all 
-       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-       @set +e; $(am__set_TESTS_bases); \
-       bases=`for i in $$bases; do echo $$i; done \
-                | $(am__list_recheck_tests)` || exit 1; \
-       log_list=`for i in $$bases; do echo $$i.log; done`; \
-       log_list=`echo $$log_list`; \
-       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-               am__force_recheck=am--force-recheck \
-               TEST_LOGS="$$log_list"; \
-       exit $$?
-.test.log:
-       @p='$<'; \
-       $(am__set_b); \
-       $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-       --log-file $$b.log --trs-file $$b.trs \
-       $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-       "$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@      @p='$<'; \
-@am__EXEEXT_TRUE@      $(am__set_b); \
-@am__EXEEXT_TRUE@      $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@      --log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@      $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@      "$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-       $(MAKE) $(AM_MAKEFLAGS) \
-         top_distdir="$(top_distdir)" distdir="$(distdir)" \
-         dist-hook
-check-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-@ENABLE_GTK_DOC_FALSE@all-local:
-all-am: Makefile $(MANS) all-local
-installdirs:
-       for dir in "$(DESTDIR)$(man1dir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
-mostlyclean-generic:
-       -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-       -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-       -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-local
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-       maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-       clean-generic clean-libtool clean-local cscopelist-am ctags-am \
-       dist-hook distclean distclean-generic distclean-libtool \
-       distclean-local distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-data-local install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-man1 install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic maintainer-clean-local mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       recheck tags-am uninstall uninstall-am uninstall-local \
-       uninstall-man uninstall-man1
-
-.PRECIOUS: Makefile
-
-
-gtkdoc-check.test: Makefile
-       $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
-               echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
-               chmod +x $@
-
-all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-.PHONY: all-gtk-doc
-
-@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
-
-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-
-$(REPORT_FILES): sgml-build.stamp
-
-setup-build.stamp:
-       -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-         files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
-         if test "x$$files" != "x" ; then \
-           for file in $$files ; do \
-             destdir=`dirname $(abs_builddir)/$$file`; \
-             test -d "$$destdir" || mkdir -p "$$destdir"; \
-             test -f $(abs_srcdir)/$$file && \
-               cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
-           done; \
-         fi; \
-       fi
-       $(AM_V_at)touch setup-build.stamp
-
-scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
-       $(GTK_DOC_V_SCAN)_source_dir='' ; \
-       for i in $(DOC_SOURCE_DIR) ; do \
-         _source_dir="$${_source_dir} --source-dir=$$i" ; \
-       done ; \
-       gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-       $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-         scanobj_options=""; \
-         gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-         if test "$$?" = "0"; then \
-           if test "x$(V)" = "x1"; then \
-             scanobj_options="--verbose"; \
-           fi; \
-         fi; \
-         CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
-         gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
-       else \
-         for i in $(SCANOBJ_FILES) ; do \
-           test -f $$i || touch $$i ; \
-         done \
-       fi
-       $(AM_V_at)touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-       @true
-
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
-       $(GTK_DOC_V_XML)_source_dir='' ; \
-       for i in $(DOC_SOURCE_DIR) ; do \
-         _source_dir="$${_source_dir} --source-dir=$$i" ; \
-       done ; \
-       gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-       $(AM_V_at)touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-       @true
-
-xml/gtkdocentities.ent: Makefile
-       $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
-               echo "<!ENTITY package \"$(PACKAGE)\">"; \
-               echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
-               echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
-               echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
-               echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
-               echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
-               echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
-       ) > $@
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
-       $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
-       mkhtml_options=""; \
-       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-       if test "$$?" = "0"; then \
-         if test "x$(V)" = "x1"; then \
-           mkhtml_options="$$mkhtml_options --verbose"; \
-         fi; \
-       fi; \
-       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-       if test "$$?" = "0"; then \
-         mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
-       fi; \
-       cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-       -@test "x$(HTML_IMAGES)" = "x" || \
-       for file in $(HTML_IMAGES) ; do \
-         test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
-         test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-       done;
-       $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       $(AM_V_at)touch html-build.stamp
-
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
-       $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
-       mkpdf_options=""; \
-       gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-       if test "$$?" = "0"; then \
-         if test "x$(V)" = "x1"; then \
-           mkpdf_options="$$mkpdf_options --verbose"; \
-         fi; \
-       fi; \
-       if test "x$(HTML_IMAGES)" != "x"; then \
-         for img in $(HTML_IMAGES); do \
-           part=`dirname $$img`; \
-           echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
-           if test $$? != 0; then \
-             mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
-           fi; \
-         done; \
-       fi; \
-       gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-       $(AM_V_at)touch pdf-build.stamp
-
-##############
-
-clean-local:
-       @rm -f *~ *.bak
-       @rm -rf .libs
-       @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
-         rm -f $(DOC_MODULE).types; \
-       fi
-       @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
-         rm -f $(DOC_MODULE)-sections.txt; \
-       fi
-
-distclean-local:
-       @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
-           $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-       @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-           rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
-       fi
-
-maintainer-clean-local:
-       @rm -rf xml html
-
-install-data-local:
-       @installfiles=`echo $(builddir)/html/*`; \
-       if test "$$installfiles" = '$(builddir)/html/*'; \
-       then echo 1>&2 'Nothing to install' ; \
-       else \
-         if test -n "$(DOC_MODULE_VERSION)"; then \
-           installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-         else \
-           installdir="$(DESTDIR)$(TARGET_DIR)"; \
-         fi; \
-         $(mkinstalldirs) $${installdir} ; \
-         for i in $$installfiles; do \
-           echo ' $(INSTALL_DATA) '$$i ; \
-           $(INSTALL_DATA) $$i $${installdir}; \
-         done; \
-         if test -n "$(DOC_MODULE_VERSION)"; then \
-           mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
-             $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-         fi; \
-         $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-       fi
-
-uninstall-local:
-       @if test -n "$(DOC_MODULE_VERSION)"; then \
-         installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-       else \
-         installdir="$(DESTDIR)$(TARGET_DIR)"; \
-       fi; \
-       rm -rf $${installdir}
-
-#
-# Require gtk-doc when making dist
-#
-@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
-@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
-@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc is needed to run 'make dist'.         ***"
-@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc was not found when 'configure' ran.   ***"
-@HAVE_GTK_DOC_FALSE@   @echo "*** please install gtk-doc and rerun 'configure'. ***"
-@HAVE_GTK_DOC_FALSE@   @false
-
-dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-       @mkdir $(distdir)/html
-       @cp ./html/* $(distdir)/html
-       @-cp ./$(DOC_MODULE).pdf $(distdir)/
-       @-cp ./$(DOC_MODULE).types $(distdir)/
-       @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
-       @cd $(distdir) && rm -f $(DISTCLEANFILES)
-       @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs
-
-@ENABLE_MAN_TRUE@.xml.1:
-@ENABLE_MAN_TRUE@      $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-CLEANFILES ?=
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/doc/reference/json-glib-overrides.txt b/doc/reference/json-glib-overrides.txt
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/doc/reference/version.xml b/doc/reference/version.xml
deleted file mode 100644 (file)
index 3c43790..0000000
+++ /dev/null
@@ -1 +0,0 @@
-1.2.6
diff --git a/doc/reference/version.xml.in b/doc/reference/version.xml.in
deleted file mode 100644 (file)
index c8d7ac8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-@JSON_VERSION@
\ No newline at end of file
index 5709b54..e4a12a5 100644 (file)
@@ -87,18 +87,19 @@ GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
 
 setup-build.stamp:
        -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-         files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
-         if test "x$$files" != "x" ; then \
-           for file in $$files ; do \
-             destdir=`dirname $(abs_builddir)/$$file`; \
-             test -d "$$destdir" || mkdir -p "$$destdir"; \
-             test -f $(abs_srcdir)/$$file && \
-               cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
-           done; \
-         fi; \
+           files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
+           if test "x$$files" != "x" ; then \
+               for file in $$files ; do \
+                   destdir=`dirname $(abs_builddir)/$$file`; \
+                   test -d "$$destdir" || mkdir -p "$$destdir"; \
+                   test -f $(abs_srcdir)/$$file && \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+               done; \
+           fi; \
        fi
        $(AM_V_at)touch setup-build.stamp
 
+
 #### scan ####
 
 GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
@@ -112,23 +113,23 @@ GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
 scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
        $(GTK_DOC_V_SCAN)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
-         _source_dir="$${_source_dir} --source-dir=$$i" ; \
+           _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
        $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-         scanobj_options=""; \
-         gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-         if test "$$?" = "0"; then \
-           if test "x$(V)" = "x1"; then \
-             scanobj_options="--verbose"; \
+           scanobj_options=""; \
+           gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+           if test "$$?" = "0"; then \
+               if test "x$(V)" = "x1"; then \
+                   scanobj_options="--verbose"; \
+               fi; \
            fi; \
-         fi; \
-         CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
-         gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+           gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
        else \
-         for i in $(SCANOBJ_FILES) ; do \
-           test -f $$i || touch $$i ; \
-         done \
+           for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+           done \
        fi
        $(AM_V_at)touch scan-build.stamp
 
@@ -144,7 +145,7 @@ GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
 sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
        $(GTK_DOC_V_XML)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
-         _source_dir="$${_source_dir} --source-dir=$$i" ; \
+           _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
        $(AM_V_at)touch sgml-build.stamp
@@ -189,8 +190,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
        cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
        -@test "x$(HTML_IMAGES)" = "x" || \
        for file in $(HTML_IMAGES) ; do \
-         test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
-         test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+         if test -f $(abs_srcdir)/$$file ; then \
+           cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+         fi; \
+         if test -f $(abs_builddir)/$$file ; then \
+           cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+         fi; \
        done;
        $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
        $(AM_V_at)touch html-build.stamp
index c85b6c6..8e3064a 100644 (file)
@@ -1245,7 +1245,7 @@ stream.</doc>
       <doc xml:space="preserve">Json major version component (e.g. 1 if %JSON_VERSION is 1.2.3)</doc>
       <type name="gint" c:type="gint"/>
     </constant>
-    <constant name="MICRO_VERSION" value="6" c:type="JSON_MICRO_VERSION">
+    <constant name="MICRO_VERSION" value="8" c:type="JSON_MICRO_VERSION">
       <doc xml:space="preserve">Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3)</doc>
       <type name="gint" c:type="gint"/>
     </constant>
@@ -4806,7 +4806,7 @@ sequence.</doc>
         </callback>
       </field>
     </record>
-    <constant name="VERSION_S" value="1.2.6" c:type="JSON_VERSION_S">
+    <constant name="VERSION_S" value="1.2.8" c:type="JSON_VERSION_S">
       <doc xml:space="preserve">JSON-GLib version, encoded as a string, useful for printing and
 concatenation.</doc>
       <type name="utf8" c:type="gchar*"/>
index 3c84041..8b90662 100644 (file)
@@ -202,7 +202,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_gir_DATA_DIST) \
        $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = json-glib.pc json-version.h
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -300,7 +300,7 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -350,7 +350,8 @@ am__recursive_targets = \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
        distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+       $(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -370,8 +371,8 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/json-glib.pc.in \
-       $(srcdir)/json-version.h.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+       $(srcdir)/json-glib.pc.in $(srcdir)/json-version.h.in \
        $(top_srcdir)/build/Makefile.msvc-introspection \
        $(top_srcdir)/build/Makefile.msvcproj \
        $(top_srcdir)/build/autotools/Makefile.am.enums \
@@ -758,7 +759,7 @@ _headers_destdir = $(subst /,\\,$(_headers_dest_posix))
 @HAVE_INTROSPECTION_TRUE@_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
 @HAVE_INTROSPECTION_TRUE@_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
 @HAVE_INTROSPECTION_TRUE@_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
-all: $(BUILT_SOURCES)
+all: $(BUILT_SOURCES) config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
@@ -793,6 +794,21 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+       @test -f $@ || rm -f stamp-h1
+       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+       @rm -f stamp-h1
+       cd $(top_builddir) && $(SHELL) ./config.status json-glib/config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+       ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+       rm -f stamp-h1
+       touch $@
+
+distclean-hdr:
+       -rm -f config.h stamp-h1
 json-glib.pc: $(top_builddir)/config.status $(srcdir)/json-glib.pc.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 json-version.h: $(top_builddir)/config.status $(srcdir)/json-version.h.in
@@ -1340,7 +1356,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) config.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs: installdirs-recursive
@@ -1391,7 +1407,7 @@ distclean: distclean-recursive
        -rm -rf ./$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
+       distclean-hdr distclean-tags
 
 dvi: dvi-recursive
 
@@ -1463,21 +1479,22 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_girDATA \
        check-am clean clean-binPROGRAMS clean-generic \
        clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
        ctags-am dist-hook distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-tags distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-binPROGRAMS install-data install-data-am \
-       install-dist_girDATA install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-jsonincludeDATA install-libLTLIBRARIES \
-       install-man install-pdf install-pdf-am install-pkgconfigDATA \
-       install-ps install-ps-am install-strip install-typelibsDATA \
-       installcheck installcheck-am installdirs installdirs-am \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-       uninstall-binPROGRAMS uninstall-dist_girDATA \
-       uninstall-jsonincludeDATA uninstall-libLTLIBRARIES \
-       uninstall-pkgconfigDATA uninstall-typelibsDATA
+       distclean-generic distclean-hdr distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-binPROGRAMS install-data \
+       install-data-am install-dist_girDATA install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am \
+       install-jsonincludeDATA install-libLTLIBRARIES install-man \
+       install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+       install-ps-am install-strip install-typelibsDATA installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+       uninstall-dist_girDATA uninstall-jsonincludeDATA \
+       uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+       uninstall-typelibsDATA
 
 .PRECIOUS: Makefile
 
similarity index 96%
rename from config.h.in
rename to json-glib/config.h.in
index ffbdb72..d071ccf 100644 (file)
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+/* json-glib/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
index 1a86ead..8a6c8e5 100644 (file)
@@ -8,4 +8,4 @@ Description: JSON Parser for GLib
 Version: @VERSION@
 Libs: -L${libdir} -ljson-glib-1.0
 Cflags: -I${includedir}/json-glib-1.0
-Requires: gobject-2.0 gio-2.0
+Requires: gio-2.0
index c325da5..ed09e9b 100644 (file)
@@ -48,7 +48,7 @@
  * path index is separated using either the dot notation or the bracket
  * notation, e.g.:
  *
- * |[
+ * |[<!-- language="plain" -->
  *   // dot notation
  *   $.store.book[0].title
  *
@@ -97,7 +97,8 @@
  * ## Example of JSONPath matches
  * The following example shows some of the results of using #JsonPath
  * on a JSON tree. We use the following JSON description of a bookstore:
- * |[
+ *
+ * |[<!-- language="plain" -->
  *   { "store": {
  *       "book": [
  *         { "category": "reference", "author": "Nigel Rees",
  *
  * The output will be:
  *
- * |[
+ * |[<!-- language="plain" -->
  *   ["Nigel Rees","Evelyn Waugh","Herman Melville","J. R. R. Tolkien"]
  * ]|
  *
index db5735e..b2c9163 100644 (file)
  *
  * Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3)
  */
-#define JSON_MICRO_VERSION              (6)
+#define JSON_MICRO_VERSION              (8)
 
 /**
  * JSON_VERSION
  *
  * Json version.
  */
-#define JSON_VERSION                    (1.2.6)
+#define JSON_VERSION                    (1.2.8)
 
 /**
  * JSON_VERSION_S:
@@ -70,7 +70,7 @@
  * JSON-GLib version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define JSON_VERSION_S                  "1.2.6"
+#define JSON_VERSION_S                  "1.2.8"
 
 #define JSON_ENCODE_VERSION(major,minor,micro) \
         ((major) << 24 | (minor) << 16 | (micro) << 8)
index 11190c6..d636400 100644 (file)
@@ -48,12 +48,13 @@ version_data.set('JSON_MINOR_VERSION', json_version_minor)
 version_data.set('JSON_MICRO_VERSION', json_version_micro)
 version_data.set('JSON_VERSION', meson.project_version())
 
-version_h = configure_file(input: 'json-version.h.in',
-                           output: 'json-version.h',
-                           install_dir: install_header_dir,
-                           configuration: version_data)
+json_version_h = configure_file(input: 'json-version.h.in',
+                                output: 'json-version.h',
+                                install_dir: install_header_dir,
+                                install: true,
+                                configuration: version_data)
 
-install_headers(source_h, subdir: install_header_subdir)
+install_headers(source_h + [ 'json-glib.h', ], subdir: install_header_subdir)
 
 json_c_args = [
   '-DJSON_COMPILATION',
@@ -72,9 +73,8 @@ if host_system == 'darwin'
   common_ldflags += [ '-compatibility_version=1', '-current_version=1.0', ]
 endif
 
-
 json_lib = library('json-glib-1.0',
-                   source_c,
+                   source_c + json_glib_enums,
                    version: libversion,
                    soversion: soversion,
                    include_directories: root_dir,
@@ -86,31 +86,40 @@ json_lib = library('json-glib-1.0',
 pkgg = import('pkgconfig')
 
 pkgg.generate(libraries: [ json_lib ],
-              subdirs: '.',
+              subdirs: 'json-glib-@0@'.format(apiversion),
               version: json_version,
               name: 'JSON-GLib',
               filebase: 'json-glib-@0@'.format(apiversion),
               description: 'JSON Parser for GLib.',
-              requires: 'glib-2.0 gio-2.0')
+              requires: 'gio-2.0')
+
+# Generated headers, used to declare the dependency for internal
+# targets
+json_gen_headers = [ json_version_h, json_glib_enums.get(1), ]
 
-json_gen_sources = [ json_glib_enums, version_h ]
 if build_gir
-    json_gen_sources += gnome.generate_gir(json_lib,
-                                           sources: source_c + source_h,
-                                           namespace: 'Json',
-                                           nsversion: apiversion,
-                                           identifier_prefix: 'Json',
-                                           symbol_prefix: 'json',
-                                           export_packages: 'json-glib-1.0',
-                                           includes: [ 'GObject-2.0', 'Gio-2.0', ],
-                                           install: true,
-                                           extra_args: ['-DJSON_COMPILATION'])
+  gir_args = [
+    '--c-include=json-glib/json-glib.h',
+    '-DJSON_COMPILATION',
+  ]
+
+
+  gnome.generate_gir(json_lib,
+                     sources: source_c + source_h + json_glib_enums + [ json_version_h ],
+                     namespace: 'Json',
+                     nsversion: apiversion,
+                     identifier_prefix: 'Json',
+                     symbol_prefix: 'json',
+                     export_packages: 'json-glib-1.0',
+                     includes: [ 'GObject-2.0', 'Gio-2.0', ],
+                     install: true,
+                     extra_args: gir_args)
 endif
 
 json_glib_dep = declare_dependency(link_with: json_lib,
                                    include_directories: root_dir,
                                    dependencies: [ gobject_dep, gio_dep, ],
-                                   sources: json_gen_sources)
+                                   sources: json_gen_headers)
 
 tools = [
   [ 'json-glib-validate', [ 'json-glib-validate.c', ] ],
index 30c6d8a..517c601 100644 (file)
@@ -155,7 +155,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/json-glib/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -296,7 +296,7 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/json-glib
 depcomp = $(SHELL) $(top_srcdir)/build/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
index 289e841..43cbfd9 100644 (file)
@@ -1,4 +1,4 @@
-project('json-glib', 'c', version: '1.2.6',
+project('json-glib', 'c', version: '1.2.8',
         license: 'LGPLv2.1+',
         default_options: [
           'warning_level=1',
@@ -10,24 +10,24 @@ project('json-glib', 'c', version: '1.2.6',
 # Versionning
 json_version = meson.project_version()
 version_arr = json_version.split('.')
-json_version_major = version_arr[0]
-json_version_minor = version_arr[1]
-json_version_micro = version_arr[2]
+json_version_major = version_arr[0].to_int()
+json_version_minor = version_arr[1].to_int()
+json_version_micro = version_arr[2].to_int()
 
 apiversion = '1.0'
 soversion = 0
 
-if json_version_micro.to_int().is_odd()
+if json_version_minor.is_odd()
   json_interface_age = 0
 else
-  json_interface_age = json_version_micro.to_int()
+  json_interface_age = json_version_micro
 endif
 
 # maintaining compatibility with the previous libtool versioning
 # current = minor * 100 + micro - interface
 # revision = interface
 soversion = 0
-current = json_version_minor.to_int() * 100 + json_version_micro.to_int() - json_interface_age
+current = json_version_minor * 100 + json_version_micro - json_interface_age
 revision = json_interface_age
 libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
 
@@ -154,5 +154,5 @@ subdir('json-glib')
 subdir('po')
 
 if get_option('enable-gtk-doc')
-  subdir('doc/reference')
+  subdir('doc')
 endif
index 6b7fd8e..fdaebda 100644 (file)
Binary files a/po/as.gmo and b/po/as.gmo differ
index a130f67..2b5b5c0 100644 (file)
--- a/po/as.po
+++ b/po/as.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-08-20 13:18+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: বিশ্লেষণ ত্ৰুটি: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON তথ্য UTF-8 এনক'ডেড হব লাগিব"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath অভিব্যক্তিত কেৱল এটা ৰুট ন'ডৰ অনুমতি আছে"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "ৰুট ন'ড অবৈধ আখৰ '%c' দ্বাৰা অনুকৰণ কৰা হৈছে"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ". আখৰৰ পিছত সন্ধানহীন সদস্য নাম অথবা ৱাইল্ডকাৰ্ড"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "স্খলিত স্লাইচ অভিব্যক্তি '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "অবৈধ সংহতি বিৱৰণ '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "অবৈধ স্লাইচ বিৱৰণ '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "অভৈধ এৰে সূচী বিৱৰণ '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "অবৈধ প্ৰথম আখৰ '%c'"
index 2a54594..bbde40d 100644 (file)
Binary files a/po/bg.gmo and b/po/bg.gmo differ
index ba36eff..26723c4 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-01-08 21:45+0200\n"
 "Last-Translator: Ivaylo Valkov <ivaylo@e-valkov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: Грешка при анализиране: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Позволен е само един коренов възел в изрази от вида „JSONPath“"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Символът „%c“ след кореновия възел е грешен"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Неправилен израз за отрязък: „%*s“"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Неправилна дефиниция за множество „%*s“"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Неправилна дефиниция за отрязък: „%*s“"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Неправилна дефиниция за индекс на масив „%*s“"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 89d42c7..194d621 100644 (file)
Binary files a/po/bn_IN.gmo and b/po/bn_IN.gmo differ
index 0eef893..1ca2546 100644 (file)
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2012-09-23 11:44+0530\n"
 "Last-Translator: Sayak Sarkar <sayak.bugsmith@gmail.com>\n"
 "Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d: পার্স ত্রুটি: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "কেবলমাত্র একটি রুট নোড একটি JSONPath অভিব্যক্তিতে অনুমোদিত করা হয়"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "রুট নোড অবৈধ অক্ষর '%c' দ্বারা অনুসরিত"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "ত্রুটিপূর্ণ স্লাইস্ অভিব্যক্তি '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "অবৈধ সেট সংজ্ঞা '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "অবৈধ স্লাইস্ সংজ্ঞা '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "অবৈধ অ্যারের সূচক সংজ্ঞা '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 9062c5a..bc86e70 100644 (file)
Binary files a/po/bs.gmo and b/po/bs.gmo differ
index 300124f..cda4c89 100644 (file)
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: json-glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2015-02-04 15:19+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -161,41 +161,41 @@ msgstr "%s:%d:%d: Greška u analizi: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON podaci moraju biti UTF-8 kodirani"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Samo jedan korijenski čvor je dozvoljen u JSONPath izrazu"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Korijenski čvor prati pogrešan znak '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "NEdostaje člansko ime ili zamjenski znak . poslije"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Deformirani izraz isječka '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Pogrešna definicija skupa '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Pogrešna definicija isječka '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Pogrešna definicija indeksa niza '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Nevažeći prvi znak '%c'"
index 344d79b..40f7334 100644 (file)
Binary files a/po/ca.gmo and b/po/ca.gmo differ
index 594a8d9..e621e96 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-02-22 21:47+0100\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: error en l'anàlisi: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Les dades JSON han d'estar codificades amb UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Només es pot utilitzar un node arrel en una expressió JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "El caràcter «%c» que segueix el node arrel no és vàlid"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Manca el nom del membre o un comodí després del caràcter «.»"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "L'expressió de tallat «%*s» no està ben formatada"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "La definició del conjunt «%*s» no és vàlida"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "La definició del tallat «%*s» no és vàlida"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "La definició de l'índex de la matriu «%*s» no és vàlida"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "El primer caràcter «%c» no és vàlid"
index 302e1db..c49b73a 100644 (file)
Binary files a/po/ca@valencia.gmo and b/po/ca@valencia.gmo differ
index f7ad1e2..7098a59 100644 (file)
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-01-21 00:26+0100\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: error en l'anàlisi: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Només es pot utilitzar un node arrel en una expressió JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "El caràcter «%c» que segueix el node arrel no és vàlid"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "L'expressió de tallat «%*s» no està ben formatada"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "La definició del conjunt «%*s» no és vàlida"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "La definició del tallat «%*s» no és vàlida"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "La definició de l'índex de la matriu «%*s» no és vàlida"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 16a7a56..9fb8bdc 100644 (file)
Binary files a/po/cs.gmo and b/po/cs.gmo differ
index 6004d3f..f01ac16 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-01-18 22:45+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: Chyba zpracování: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Data JSON musí být kódována v UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Ve výrazu JSONPath je dovolen pouze jeden kořenový uzel"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Kořenový uzel následován neplatným znakem „%c“"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Schází název člena nebo divoký znak po znaku tečky."
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Chybný výraz dílu „%*s“"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Neplatná definice množiny „%*s“"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Neplatná definice dílu „%*s“"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Neplatná definice indexu pole „%*s“"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Neplatný první znak „%c“"
index af56495..9ce1782 100644 (file)
Binary files a/po/da.gmo and b/po/da.gmo differ
index b81eef7..ccaec74 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-15 13:53+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: Fortolkningsfejl: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON-data skal være UTF-8-kodet"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Kun en rodknude tillades i et JSONPath-udtryk"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Rodknuden efterfølges af et ugyldigt tegn, \"%c\""
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Manglende medlemsnavn eller wildcard efter .-tegn"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Misdannet slice-udtryk \"%*s\""
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Ugyldig mængdedefinition \"%*s\""
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Ugyldig slice-definition \"%*s\""
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Ugyldig arrayindeksdefinition \"%*s\""
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Ugyldigt første tegn \"%c\""
index a788ead..c583e3c 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ
index 1e05592..97ef905 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-08-14 15:52+0100\n"
 "Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
@@ -169,41 +169,41 @@ msgstr "%s:%d:%d: Verarbeitungsfehler: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON-Daten müssen in UTF-8 kodiert sein"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Im JSONPath-Ausdruck ist nur ein einziger Root-Knoten erlaubt"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Auf den Root-Knoten folgt das ungültige Zeichen »%c«"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Name des Mitglieds oder Platzhalter nach dem . Zeichen fehlt"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Ungültiger Slice-Ausdruck »%*s«"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Ungültige »set«-Definition »%*s«"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Ungültige »slice«-Definition »%*s«"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Ungültige Array-Index-Definition »%*s«"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Ungültiges erstes Zeichen »%c«"
index c471cac..5515f95 100644 (file)
Binary files a/po/el.gmo and b/po/el.gmo differ
index 531ba17..a228f9b 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-07-09 14:38+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
 "Language-Team: team@lists.gnome.gr\n"
@@ -169,41 +169,41 @@ msgstr "%s:%d:%d: Σφάλμα ανάλυσης: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Τα δεδομένα JSON πρέπει να είναι κωδικοποιημένα ως UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Μόνο ένας αρχικός κόμβος επιτρέπεται σε μια έκφραση JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Αρχικός κόμβος ακολουθούμενος από άκυρο χαρακτήρα '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Λείπει όνομα μέλους ή συμβόλου υποκατάστασης μετά τον χαρακτήρα ."
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Κακοδιατυπωμένη έκφραση τεμαχισμού '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Άκυρος ορισμός συνόλου '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Άκυρος ορισμός τεμαχισμού '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Άκυρος ορισμός δείκτη πίνακα '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Άκυρος ο πρώτος χαρακτήρας '%c'"
index fafabcf..8e0f5eb 100644 (file)
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
index 1dbdcf0..459c93f 100644 (file)
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2016-09-18 10:56+0200\n"
 "Last-Translator: David King <amigadave@amigadave.com>\n"
 "Language-Team: British English <en_GB@li.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: Parse error: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON data must be UTF-8 encoded"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Only one root node is allowed in a JSONPath expression"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Root node followed by invalid character '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Missing member name or wildcard after . character"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Malformed slice expression '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Invalid set definition '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Invalid slice definition '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Invalid array index definition '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Invalid first character '%c'"
index e8fec59..151cc49 100644 (file)
Binary files a/po/eo.gmo and b/po/eo.gmo differ
index df59120..4a96e7e 100644 (file)
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-04-01 18:26+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: Analiz-eraro: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Nur unu 'Root'-nodo estas permesata en JSONPath-esprimo"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Malantaŭ la radika nodo sekvas nevalida signo \"%c\""
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Nevalida segment-esprimo \"%*s\""
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Nevalida \"set\"-difino \"%*s\""
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Nevalida segment-difino \"%*s\""
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Nevalida tebel-indeks-difino \"%*s\""
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 2f89ce1..7e29599 100644 (file)
Binary files a/po/es.gmo and b/po/es.gmo differ
index d789875..19b2967 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-12-09 15:59+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
@@ -169,41 +169,41 @@ msgstr "%s:%d:%d: Error al analizr: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Los datos JSON deben estar codificados en UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Sólo se permite un nodo raíz en una expresión JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nodo raíz seguido de un carácter «%c» no válido"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Falta el nombre del miembro o el comodín después del «.»."
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Expresión de particionado «%*s» mal formada"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definición de conjunto no válida «%*s»"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definición de particionado no válida «%*s»"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definición de índice de vector no válida «%*s»"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Primer carácter «%c» no válido"
index ba1c6d7..6771661 100644 (file)
Binary files a/po/et.gmo and b/po/et.gmo differ
index b850e4f..b328f55 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2012-10-29 20:51+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <gnome-et-list@gnome.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: parsimise viga: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Ainult juursõlm on lubatud JSONPath expression lauses"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Juursõlmele järgneb sobimatu märk '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Sobimatu tüki väljendus (slice expression) '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Sobimatu kogu (set) definitsioon '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Sobimatu tüki (slice) definitsioon '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Sobimatu massiivi indeksi definitsioon '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index b99531b..a90e144 100644 (file)
Binary files a/po/eu.gmo and b/po/eu.gmo differ
index 7895603..3e6c8c7 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-04-03 17:38+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.org>\n"
@@ -169,42 +169,42 @@ msgstr "%s:%d:%d: analisi-errorea: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON datuak UTF-8 kodeketan egon behar dute"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr ""
 "Soilik erroko nodo bakar bat dago baimenduta JSONPath adierazpen batean"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Erroko nodoaren ondoren baliogabeko '%c' karakterea dago"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Kidearen izena edo '.' karakterearen ondorengo izartxoa falta da"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Gaizki osatutako '%*s' adierazpen zatia"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "'%*s' multzoaren definizioa baliogabea"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Baliogabeko '%*s' definizio zatia"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Baliogabeko '%*s' matrizearen indizearen definizioa"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Aurreneko '%c' karakterea baliogabea"
index dee72b3..52634b6 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ
index 664da2e..66654fa 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-11 22:43+0100\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: Erreur d'analyse : %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Les données JSON doivent être codées en UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Un seul nœud racine autorisé dans une expression JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nœud racine suivi d'un caractère invalide « %c »"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Nom de membre ou caractère joker manquant après un caractère « . »"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Expression de segmentation malformée « %*s »"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Définition d'ensemble invalide « %*s »"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Définition de segmentation invalide « %*s »"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Définition d'indice de tableau invalide « %*s »"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Premier caractère « %c » non valide"
index 487994c..34eab82 100644 (file)
Binary files a/po/fur.gmo and b/po/fur.gmo differ
index d105dca..dee4535 100644 (file)
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2016-04-08 10:15+0200\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: erôr di analisi: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "I dâts JSON a scugnin jessi codificâts in UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Si amet dome un grop lidrîs intune espression JSON"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Grop lidrîs seguît da caratar no valit '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Al mancje il non dal membri o un caratar speciâl dopo il caratar \".\""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Espression slice '%*s' scrite mâl"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definizion di set '%*s' no valide"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definizion di slice '%*s' no valide"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definizion di indiç array '%*s'  no valide"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Prin caratar '%c' no valit"
index 7f27cde..bc14893 100644 (file)
Binary files a/po/gl.gmo and b/po/gl.gmo differ
index 02a3b7d..50cf383 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-12-19 01:13+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: erro de análise: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Os datos JSON deben ter a codificación UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Só se permite un nodo raíz nunha expresión JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nodo raíz seguido dun carácter «%c» non válido"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Falta o nome do membro ou comodín logo do caracter «.»"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Expresión de particionado «%*s» mal formada"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definición de conxunto non válida «%*s»"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definición de particionado non válida «%*s»"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definición de índice de vector non válida «%*s»"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Primeiro caracter «%c» non válido"
index 0d53cd2..f0d4ac1 100644 (file)
Binary files a/po/he.gmo and b/po/he.gmo differ
index 6b12c9c..fda540d 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib 0.17.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-01-26 05:32+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
@@ -168,41 +168,41 @@ msgstr "%s:%d:%d: Parse error: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON data must be UTF-8 encoded"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Only one root node is allowed in a JSONPath expression"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Root node followed by invalid character '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Missing member name or wildcard after . character"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Malformed slice expression '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Invalid set definition '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Invalid slice definition '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Invalid array index definition '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Invalid first character '%c'"
index 88ce8f8..12aec2b 100644 (file)
Binary files a/po/hi.gmo and b/po/hi.gmo differ
index 9db2c8d..bf588d8 100644 (file)
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2012-09-20 10:33+0530\n"
 "Last-Translator: chandankumar <chandankumar.093047@gmail.com>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d: व्याख्या त्रुटि: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "एक JSONPath अभिव्यक्ति में केवल एक रूट नोड की अनुमति दी है"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "अवैध अक्षर '%c' के बाद रूट नोड "
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "विकृत स्लाइस अभिव्यक्ति '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "अमान्य सेट परिभाषा '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "अवैध स्लाइस परिभाषा '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "अवैध सरणी सूचकांक परिभाषा '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 695f86e..87dcdde 100644 (file)
Binary files a/po/hu.gmo and b/po/hu.gmo differ
index 338af35..e84eee3 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-21 18:09+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
@@ -168,41 +168,41 @@ msgstr "%s:%d:%d: feldolgozási hiba: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "A JSON adatoknak UTF-8 kódolásúnak kell lenniük"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Csak egy gyökércsomópont engedélyezett a JSONPath kifejezésben"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "A gyökércsomópontot érvénytelen karakter követi: „%c”"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Hiányzó tagnév vagy helyettesítő karakter a . után"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Hibás szeletkifejezés: „%*s”"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Érvénytelen halmazdefiníció: „%*s”"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Érvénytelen szeletdefiníció: „%*s”"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Érvénytelen tömbindex-definíció: „%*s”"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Érvénytelen első karakter: „%c”"
index 3aafc23..f6082fb 100644 (file)
Binary files a/po/id.gmo and b/po/id.gmo differ
index 5bebfb6..d8c4b60 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-01-02 23:38+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
@@ -168,41 +168,41 @@ msgstr "%s:%d:%d: Galat mengurai: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Data JSON mesti ter-enkode UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Hanya satu node akar yang diijinkan dalam ekspresi JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Node akar diikuti oleh karakter tak valid '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Kurang nama anggota atau wildcard setelah karakter . (titik)"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Ekspresi slice '%*s' salah bentuk"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definisi set '%*s' tak valid"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definisi slice '%*s' tak valid"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definisi indeks larik '%*s' tak valid"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Karakter pertama '%c' tak valid"
index 91a7bd2..d9d38f3 100644 (file)
Binary files a/po/it.gmo and b/po/it.gmo differ
index 0747e21..013a270 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-12-11 10:47+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -169,42 +169,42 @@ msgstr "%s:%d:%d: errore di analisi: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "I dati JSON devono essere codificati in UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "È consentito un solo nodo radice in una espressione JSON"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nodo radice seguito dal carattere non valido '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 "Manca il nome del membro o un carattere speciale dopo il carattere \".\""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Espressione slice '%*s' malformata"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definizione di set '%*s' non valida"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definizione di slice '%*s' non valida"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definizione di indice array '%*s' non valida"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Primo carattere \"%c\" non valido"
index 332683c..88976b5 100644 (file)
Binary files a/po/ja.gmo and b/po/ja.gmo differ
index 7b29bf6..845e34a 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-09-18 22:29+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa@gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: パースエラー: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath 式ではルートノード一つだけが許可されています"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "ルートノードの後に無効な文字 '%c' があります"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "不正なスライス式 '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "無効な集合定義 '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "無効なスライス定義: '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "無効な配列インデックス定義 '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index d37a87f..c2b65c8 100644 (file)
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: json-glib 1.2.6\n"
+"Project-Id-Version: json-glib 1.2.8\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,41 +165,41 @@ msgstr ""
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr ""
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr ""
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index fe2d5b8..3417817 100644 (file)
Binary files a/po/ko.gmo and b/po/ko.gmo differ
index 2a7a79f..0f3e377 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-15 02:04+0900\n"
 "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: Korean <gnome-kr@googlegroups.com>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: 해석 오류: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON 데이터는 UTF-8로 인코딩해야 합니다"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath 표현식에서는 단 하나만의 최상위 노드를 허용합니다"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "최상위 노드에 잘못된 '%c' 문자가 따라옵니다"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "멤버 이름 또는 구두점 문자 다음 와일드카드가 빠졌습니다"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "잘못된 분배 표현식 '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "잘못된 셋 정의 '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "잘못된 분배 정의 '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "잘못된 배열 인덱스 정의 '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "잘못된 첫번째 문자 '%c'"
index 3131eb5..7a6d397 100644 (file)
Binary files a/po/ky.gmo and b/po/ky.gmo differ
index daa2f36..7760bed 100644 (file)
--- a/po/ky.po
+++ b/po/ky.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-01-05 18:22+0600\n"
 "Last-Translator: Timur Zhamakeev <ztimur@gmail.com>\n"
 "Language-Team: Kirghiz <gnome-i18n@gnome.org>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d: Ажыратып окуу катасы: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath туюнтмасында бир гана башкы түйүн болушу мүмкүн"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Башкы түйүн туура эмес тамга менен аяктаган: '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Туура эмес кесүү (slice) туюнтмасы '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Туура эмес ыйгаруу (set) аныктамасы '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Туура эмес кесүү (slice) аныктамасы '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Массив индексинин туура эмес аныктамасы '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index c03fd4f..14beebb 100644 (file)
Binary files a/po/lt.gmo and b/po/lt.gmo differ
index a4d6f8a..6ede9cc 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-02-21 23:18+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
@@ -167,41 +167,41 @@ msgstr "%s:%d:%d: skaitymo klaida: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON duomenys turi būti koduoti UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath išraiškoje leidžiamas vienintelė šakninė viršūnė"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Po šakninės viršūnės yra netinkamas simbolis „%c“"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Trūksta nario pavadinimo arba pakaitos simbolio po . simbolio"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Blogai suformuota dalinimo išraiška „%*s“"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Netinkamas aibės apibrėžimas „%*s“"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Netinkamas dalinimo apibrėžimas „%*s“"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Netinkamas masyvo apibrėžimas „%*s“"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Netinkamas pirmasis simbolis „%c“"
index 8ac4586..44abadc 100644 (file)
Binary files a/po/lv.gmo and b/po/lv.gmo differ
index 0a5c94c..27ea51f 100644 (file)
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-07 16:52+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
@@ -168,41 +168,41 @@ msgstr "%s:%d:%d: parsēšanas kļūda — %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON datiem ir jābūt UTF-8 kodējumā"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath izteiksmē ir atļauta tikai viens saknes mezgls"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Pēc saknes mezgla seko nederīga rakstzīme “%c”"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Trūkst locekļa nosaukums vai aizstājējzīme pēc . rakstzīmes"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Slikti formēta gabala izteiksme “%*s”"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Nederīga kopas definīcija “%*s”"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Nederīga gabala definīcija “%*s”"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Nederīga masīva indeksa definīcija “%*s”"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Nederīga pirmā rakstzīme “%c”"
index 09116aa..f79e7ce 100644 (file)
Binary files a/po/ml.gmo and b/po/ml.gmo differ
index c344f6f..105f7ef 100644 (file)
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-02-14 21:57+0530\n"
 "Last-Translator: Jishnu Mohan <jishnu7@gmail.com>\n"
 "Language-Team: Swatantra Malayalam Computing\n"
@@ -165,41 +165,41 @@ msgstr "%s:%d:%d: പാഴ്സ് പിഴവ്: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath എക്സ്പ്രഷനില്‍ ഒരു റൂട്ടേ അനുവദിനീയമായിട്ടുള്ളു"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "റൂട്ട് നോഡിന് ശേഷം തെറ്റായ അക്ഷരം '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "തെറ്റായ സ്ലൈസ് എക്സ്പ്രഷന്‍ '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "'%*s' എന്നത് തെറ്റായ കൂട്ടം നിര്‍വചനമാണ്"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "'%*s' എന്നത് തെറ്റായ സ്ലൈസ് നിര്‍വചനമാണ്"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "'%*s' എന്നത് തെറ്റായ അറേ ഇന്റെക്സ് നിര്‍വചനമാണ്"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 9e6c5cb..3e73890 100644 (file)
Binary files a/po/nb.gmo and b/po/nb.gmo differ
index 8afce75..321b354 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib 1.2.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2017-02-18 11:32+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Kjartan Maraas <i18n-nb@lister.ping.uio.no>\n"
@@ -164,41 +164,41 @@ msgstr "%s:%d:%d: Tolkefeil: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON-data må være kodet i UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Kun en rotnode tillates i et JSONPath-uttrykk"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Rotnode etterfulgt av ugyldig tegn «%c»"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Ugyldig definisjon av sett «%*s»"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr ""
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 5b98202..45150a9 100644 (file)
Binary files a/po/oc.gmo and b/po/oc.gmo differ
index df85dd0..0eac689 100644 (file)
--- a/po/oc.po
+++ b/po/oc.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2016-05-08 18:49+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
 "Language-Team: Tot En Òc\n"
@@ -171,41 +171,41 @@ msgstr "%s:%d:%d: Error d'analisi : %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Las donadas JSON devon èsser encodadas en UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Un sol nosèl raiç d'autorizat dins una expression JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nosèl raiç seguit d'un caractèr invalid « %c »"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Nom de membre o caractèr joker mancant aprèp un caractèr « . »"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Expression de talhon malformat « %*s »"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definicion d'ensemble invalida « %*s »"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definicion de talha invalida « %*s »"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definicion d'indici de tablèu invalida « %*s »"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Primièr caractèr « %c » invalid"
index 8417efa..05cb02e 100644 (file)
Binary files a/po/or.gmo and b/po/or.gmo differ
index 2ec18df..9857ed5 100644 (file)
--- a/po/or.po
+++ b/po/or.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2012-08-09 18:26+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <or@li.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d: ବିଶ୍ଳେଷଣ ତ୍ରୁଟି: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "କେବଳ ଗୋଟିଏ ମୂଖ୍ୟ ଚାଳକ ନୋଡ JSONPath ଅଭିବ୍ୟକ୍ତିରେ ଅନୁମତି ପ୍ରାପ୍ତ"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "ଅବୈଧ ଅକ୍ଷର '%c' ଦ୍ୱାରା ମୂଖ୍ୟ ଚାଳକ ନୋଡ"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "ତ୍ରୁଟିଯୁକ୍ତ ଖଣ୍ଡ ଅଭିବ୍ୟକ୍ତି '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "ଅବୈଧ ସେଟ ସଂଜ୍ଞା '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "ଅବୈଧ ଖଣ୍ଡ ସଂଜ୍ଞା '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "ଅବୈଧ ଆରେ ଅନୁକ୍ରମଣିକା ସଂଜ୍ଞା '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 6a5edec..165b5bb 100644 (file)
Binary files a/po/pa.gmo and b/po/pa.gmo differ
index 34ed1f6..663a695 100644 (file)
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-02-26 07:26+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: ਪਾਰਸ ਗਲਤੀ: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath ਸਮੀਕਰਨ ਵਿੱਚ ਇੱਕ ਰੂਟ ਨੋਡ ਹੀ ਮਨਜ਼ੂਰ ਸੀ"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "ਗਲਤ ਅੱਖਰ '%c' ਦੇ ਬਾਅਦ ਰੂਟ ਨੋਡ"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "ਨਿਕਾਰਾ ਭਾਗ ਸਮੀਕਰਨ '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "ਗਲਤ ਸੈੱਟ ਪ੍ਰੀਭਾਸ਼ਾ '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "ਗਲਤ ਭਾਗ ਪ੍ਰੀਭਾਸ਼ਾ '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "ਗਲਤ ਅਰੇ ਇੰਡੈਕਸ ਪ੍ਰੀਭਾਸ਼ਾ '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index fd145b3..dae1903 100644 (file)
Binary files a/po/pl.gmo and b/po/pl.gmo differ
index 057c11a..1dde9a8 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2016-08-22 21:33+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
@@ -168,41 +168,41 @@ msgstr "%s:%d:%d: błąd przetwarzania: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Dane JSON muszą być zakodowane w UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Dozwolony jest tylko jeden węzeł główny w wyrażeniu JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Po węźle głównym występuje nieprawidłowy znak „%c”"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Brak nazwy elementu lub wieloznacznika po znaku ."
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Błędnie sformatowane wyrażenie plasterka „%*s”"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Nieprawidłowe określenie zestawu „%*s”"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Nieprawidłowe określenie plasterka „%*s”"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Nieprawidłowe określenie indeksu tablicy „%*s”"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Nieprawidłowy pierwszy znak „%c”"
index 08685f2..0740a7b 100644 (file)
Binary files a/po/pt.gmo and b/po/pt.gmo differ
index 8d44733..86c7bc3 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: 3.12\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2015-06-25 09:43+0100\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73@openmailbox.com>\n"
 "Language-Team: Português <palbuquerque73@openmailbox.com>\n"
@@ -170,41 +170,41 @@ msgstr "%s:%d:%d: erro de processamento: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Dados JSON têm de estar codificados em UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Só um nó raiz é permitido numa expressão JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nó raiz seguido do carácter inválido \"%c\""
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Falta nome de membro ou caráter global após caráter \".\""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Expressão \"%*s\" de fatia mal formada"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definição inválida de conjunto \"%*s\""
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definição inválida de fatia \"%*s\""
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definição inválida de índice de matriz \"%*s\""
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Primeiro carácter \"%c\" inválido"
index ea66b4d..1ceef9d 100644 (file)
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
index e74cf6d..a9e98b8 100644 (file)
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-12-19 11:01-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
@@ -171,41 +171,41 @@ msgstr "%s:%d%d: Erro na análise: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Os dados JSON devem possuir codificação UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Apenas um nó raiz é permitido em uma expressão JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nó raiz seguido de caractere inválido \"%c\""
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Faltando nome de membro ou coringa após o caractere \".\""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Expressão de corte \"%*s\" má formada"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definição de conjunto \"%*s\" inválida."
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definição de corte \"%*s\" inválida"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definição de índice de vetor %*s\" inválida"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Primeiro caractere \"%c\" inválido"
index 4f19226..2c9c237 100644 (file)
Binary files a/po/ro.gmo and b/po/ro.gmo differ
index d06459d..6676c7c 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2015-06-19 19:17+0200\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
@@ -170,41 +170,41 @@ msgstr "%s:%d:%d: Eroare la parsare: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Datele JSON trebuie să fie codate UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Doar un nod rădăcină este permis într-o expresie JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Nod rădăcină urmat de caracterul nevalid „%c”"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Lipsește un nume de membru sau metacaracter după caracterul „.”"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Expresie slice eronată „%*s”"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Definiție de set nevalidă „%*s”"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Definiție slice nevalidă „%*s”"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Definiția indexului matricii nevalidă „%*s”"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Primul caracter nevalid „%c”"
index 97a0d2e..9cfb83d 100644 (file)
Binary files a/po/ru.gmo and b/po/ru.gmo differ
index ba7961d..ef7c45b 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-11 12:23+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: русский <gnome-cyr@gnome.org>\n"
@@ -171,41 +171,41 @@ msgstr "%s:%d:%d: ошибка разбора: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Данные JSON должны быть в кодировке UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "В выражении JSONPath может быть только один корневой узел"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Корневой узел заканчивается некорректным символом «%c»"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Отсутствует имя члена или шаблон после символа «.»"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Неправильное выражение среза «%*s»"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Неверное определение присвоения «%*s»"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Неверное определение среза «%*s»"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Неверное определение индекса массива «%*s»"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Неверный первый символ «%c»"
index 1066ef9..5566b62 100644 (file)
Binary files a/po/sk.gmo and b/po/sk.gmo differ
index 421213b..c844109 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2015-03-09 18:34+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
@@ -167,42 +167,42 @@ msgstr "%s:%d:%d: Chyba analýzy: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Údaje JSON musia byť v kódovaní UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Vo výraze JSONPath môže byť len jeden koreňový uzol"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Za koreňovým uzlom je neplatný znak „%c“"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Chýba názov člena alebo zástupný znak po znaku „.“"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Chybný výraz „%*s“ pre výsek"
 
 # MČ: set sa zväčša prekladá ako množina, vyhovoval by tento výraz?
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Neplatná definícia množiny „%*s“"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Neplatná definícia výseku „%*s“"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Neplatná definícia indexu poľa „%*s“"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Neplatný prvý znak „%c“"
index d86269d..89270fa 100644 (file)
Binary files a/po/sl.gmo and b/po/sl.gmo differ
index bd3d716..7c4606b 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-04-03 20:37+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
@@ -169,41 +169,41 @@ msgstr "%s:%d:%d: napaka razčlenjevanje: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Podatki JSON morajo biti kodirani v naboru UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Le eno korensko vozlišče je dovoljeno v izrazu JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Korensko vozlišče se konča z neveljavnim znakom '%c'"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Manjka ime člana ali pa nadomestni znak po znaku . (pika)"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Napačno oblikovan izraz rezine '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Neveljavno določilo '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Neveljavno določilo rezine '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Neveljavno določilo kazala polja '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Neveljaven prvi znak '%c'"
index 73b1c37..a0557f0 100644 (file)
Binary files a/po/sr.gmo and b/po/sr.gmo differ
index 5ff85de..dab7734 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: json-glib json-glib-0-14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-21 03:58+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: Грешка обраде: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "ЈСОН подаци морају бити у УТФ-8 кодирању"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Само један корени чвор је допуштен у изразу ЈСОНПутање"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "За кореним чвором следи неисправан знак „%c“"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Недостаје назив члана или џокер након знака тачке (.)"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Неисправан израз исечка „%*s“"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Неисправна одредница скупа „%*s“"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Неисправна одредница исечка „%*s“"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Неисправна одредница регистра низа „%*s“"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Неисправан први знак „%c“"
index 66189b6..7ed71f1 100644 (file)
Binary files a/po/sr@latin.gmo and b/po/sr@latin.gmo differ
index 4f6a521..df4995d 100644 (file)
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: json-glib json-glib-0-14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-21 03:58+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
@@ -166,41 +166,41 @@ msgstr "%s:%d:%d: Greška obrade: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON podaci moraju biti u UTF-8 kodiranju"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Samo jedan koreni čvor je dopušten u izrazu JSONPutanje"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Za korenim čvorom sledi neispravan znak „%c“"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Nedostaje naziv člana ili džoker nakon znaka tačke (.)"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Neispravan izraz isečka „%*s“"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Neispravna odrednica skupa „%*s“"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Neispravna odrednica isečka „%*s“"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Neispravna odrednica registra niza „%*s“"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Neispravan prvi znak „%c“"
index 6eb0c2a..211a022 100644 (file)
Binary files a/po/sv.gmo and b/po/sv.gmo differ
index 46e5ee0..cf65cab 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: json-glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2016-07-19 23:27+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -170,41 +170,41 @@ msgstr "%s:%d:%d: Tolkningsfel: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON-data måste vara UTF-8-kodad"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Bara en rotnod är tillåten i ett JSONPath-uttryck"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Rotnod efterföljd av otillåtet tecken ”%c”"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Saknar medlemsnamn eller jokertecken efter .-tecken"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Missbildat skivuttryck ”%*s”"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Ogiltig mängddefinition ”%*s”"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Ogiltig skivdefinition ”%*s”"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Ogiltig vektorindexdefinition ”%*s”"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Ogiltigt första tecken ”%c”"
index d81d088..6c9367a 100644 (file)
Binary files a/po/te.gmo and b/po/te.gmo differ
index f6cf28b..025ba33 100644 (file)
--- a/po/te.po
+++ b/po/te.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2012-10-09 16:48+0530\n"
 "Last-Translator: sasi <sasi@swecha.net>\n"
 "Language-Team: telugu <localization@swecha.net>\n"
@@ -168,41 +168,41 @@ msgstr "% s:% d: అన్వయ దోషం:% s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "కేవలం ఒక రూట్ నోడ్కు ఒక JSONPath వ్యక్తీకరణ లో అనుమతి ఉంది"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "చెల్లని అక్షరం '%c' తర్వాత రూట్ నోడ్"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "తప్పుడు ముక్క వ్యక్తీకరణ '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "చెల్లని వరు నిర్వచనం '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "చెల్లని ముక్క నిర్వచనం '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "చెల్లని వరు సూచిక నిర్వచనం '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index 2836805..a32fdba 100644 (file)
Binary files a/po/tg.gmo and b/po/tg.gmo differ
index b1b707e..b46e57c 100644 (file)
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Tajik Gnome\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-12-20 14:32+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: \n"
@@ -169,41 +169,41 @@ msgstr "%s:%d:%d: Хатои таҷзия: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Иттилооти JSON бояд ба формати UTF-8 рамзгузорӣ шавад"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Танҳо як гиреҳи решагӣ дар ифодаи JSONPath иҷозат дода шудааст"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Гиреҳи решагӣ, ки бо аломати беэътибори '%c' пайгирӣ шуд"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Баъд аз аломати \".\" номи узв ё номи алоқаманд вуҷуд надорад"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Ифодаи бадшакл: '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Таърифи маҷмӯи \"%*s\" беэътибор аст"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Таърифи нодуруст: '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Таърифи индекси қатори \"%*s\" беэътибор аст"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Аломати аввалини нодуруст: '%c'"
index 425e497..ed85cff 100644 (file)
Binary files a/po/tr.gmo and b/po/tr.gmo differ
index 38c2510..45d44a9 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-12-04 23:35+0200\n"
 "Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
@@ -169,41 +169,41 @@ msgstr "%s:%d:%d: Ayrıştırma hatası: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON verisi UTF-8 ile kodlanmış olmalıdır"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath ifadesinde yalnızca bir kök düğümüne izin verilir"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Kök düğümünü izleyen '%c' karakteri geçersiz"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Öge ismi ya da . karakterinden sonraki joker karakter eksik"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Kusurlu dilim ifadesi '%*s'"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Geçersiz küme tanımı '%*s'"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Geçersiz dilim tanımı '%*s'"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Geçersiz dizi indisi tanımı '%*s'"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Geçersiz ilk karakter '%c'"
index a3c94f7..00abe75 100644 (file)
Binary files a/po/ug.gmo and b/po/ug.gmo differ
index c71b67c..fffdfb6 100644 (file)
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2013-01-26 09:43+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
@@ -167,42 +167,42 @@ msgstr "%s:%d:%d: پارچىلاشتا خاتالىق كۆرۈلدى: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr ""
 "ئادەتتە JSONPath ئىپادىسىدە پەقەت بىرلا غول ئېلېمېنتقا ئىجازەت بېرىلگەن"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "پەقەت بىرلا غول ئېلېمېنت كەينىدە ‹%c› دېگەن ھەرپ بار ئىكەن"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "بولمىغۇر كەسمە ئىپادىسى ‹%*s›"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "توپلام ئېنىقلىمىسى ئىناۋەتسىز ‹%*s›"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "كەسمە(slice) ئېنىقلىمىسى ئىناۋەتسىز ‹%*s›"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "تىزىق ئىندېكس ئېنىقلىمىسى ئىناۋەتسىز ‹%*s›"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index a4a864f..0878bcc 100644 (file)
Binary files a/po/uk.gmo and b/po/uk.gmo differ
index 247c4a7..c115835 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-03-30 13:22+0300\n"
 "Last-Translator: Mykola Tkach <Stuartlittle1970@gmail.com>\n"
 "Language-Team: translation@linux.org.ua\n"
@@ -168,41 +168,41 @@ msgstr "%s:%d:%d: помилка розбору: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "Дані JSON повинні бути у кодуванні UTF-8"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Дозволено тільки один кореневий вузол у виразі JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Кореневий вузол супроводжується неправильним символом «%c»"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "Відсутнє ім’я члена або шаблон після символу «.»"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Неправильний вираз шару «%*s»"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Неправильне визначення набору «%*s»"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Неправильне визначення шару «%*s»"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Неправильне визначення покажчика масиву «%*s»"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "Неправильний перший символ «%c»"
index 0c8058f..0fe782f 100644 (file)
Binary files a/po/vi.gmo and b/po/vi.gmo differ
index 6aee83e..afaad4f 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2012-06-30 10:26+0700\n"
 "Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -165,41 +165,41 @@ msgstr "%s:%d: Lỗi phân tích: %s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr ""
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "Chỉ cho phép duy nhất một nút gốc trong biểu thức JSONPath"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "Ký tự không hợp lệ '%c' theo sau nút gốc"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr ""
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "Biểu thức chặt '%*s' hư"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "Định nghĩa tập '%*s' không hợp lệ"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "Định nghĩa chặt '%*s' không hợp lệ"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "Định nghĩa chỉ mục mảng '%*s' không hợp lệ"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr ""
index b725c52..0c6eb02 100644 (file)
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
index 9e6319f..2c054a8 100644 (file)
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-02-22 09:27+0800\n"
 "Last-Translator: Sphinx Jiang <yishanj13@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-zh@googlegroups.com>\n"
@@ -168,41 +168,41 @@ msgstr "%s:%d:%d:解析错误:%s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON 数据必须是 UTF-8 编码"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "JSONPath 表达式中只允许有一个根节点"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "根节点之后跟随了无效的字符“%c”"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "在字符 . 后面缺少成员名或通配符"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "有错误的 slice 表达式“%*s”"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "无效的 set 定义“%*s”"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "无效的 slice 定义“%*s”"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "无效的数组索引定义“%*s”"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "无效的首字符“%c”"
index d168fe0..0d42b73 100644 (file)
Binary files a/po/zh_HK.gmo and b/po/zh_HK.gmo differ
index a57fb11..935c327 100644 (file)
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-02-02 20:40+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -165,41 +165,41 @@ msgstr "%s:%d:%d:解析錯誤:%s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON 資料必須以 UTF-8 編碼"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "在 JSONPath 表示式中不允許一個根節點"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "根節點跟隨在無效的字符「%c」後"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "在 . 字符後缺少成員名稱或萬用字符"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "格式不良的片段表示式「%*s」"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "無效的組定義「%*s」"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "無效的片段定義「%*s」"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "無效的陣列索引定義「%*s」"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "無效的第一個字符「%c」"
index 87047eb..51a4ede 100644 (file)
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
index b8ce552..428cfd5 100644 (file)
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: json-glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
 "glib\n"
-"POT-Creation-Date: 2017-03-13 14:53+0000\n"
+"POT-Creation-Date: 2017-03-18 13:36+0000\n"
 "PO-Revision-Date: 2014-02-01 19:05+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <chinese-l10n@googlegroups.com>\n"
@@ -165,41 +165,41 @@ msgstr "%s:%d:%d:解析錯誤:%s"
 msgid "JSON data must be UTF-8 encoded"
 msgstr "JSON 資料必須以 UTF-8 編碼"
 
-#: json-glib/json-path.c:388
+#: json-glib/json-path.c:389
 msgid "Only one root node is allowed in a JSONPath expression"
 msgstr "在 JSONPath 表示式中不允許一個根節點"
 
 #. translators: the %c is the invalid character
-#: json-glib/json-path.c:397
+#: json-glib/json-path.c:398
 #, c-format
 msgid "Root node followed by invalid character '%c'"
 msgstr "根節點跟隨在無效的字元「%c」後"
 
-#: json-glib/json-path.c:437
+#: json-glib/json-path.c:438
 msgid "Missing member name or wildcard after . character"
 msgstr "在 . 字元後缺少成員名稱或萬用字元"
 
-#: json-glib/json-path.c:511
+#: json-glib/json-path.c:512
 #, c-format
 msgid "Malformed slice expression '%*s'"
 msgstr "格式不良的片段表示式「%*s」"
 
-#: json-glib/json-path.c:555
+#: json-glib/json-path.c:556
 #, c-format
 msgid "Invalid set definition '%*s'"
 msgstr "無效的組定義「%*s」"
 
-#: json-glib/json-path.c:608
+#: json-glib/json-path.c:609
 #, c-format
 msgid "Invalid slice definition '%*s'"
 msgstr "無效的片段定義「%*s」"
 
-#: json-glib/json-path.c:636
+#: json-glib/json-path.c:637
 #, c-format
 msgid "Invalid array index definition '%*s'"
 msgstr "無效的陣列索引定義「%*s」"
 
-#: json-glib/json-path.c:655
+#: json-glib/json-path.c:656
 #, c-format
 msgid "Invalid first character '%c'"
 msgstr "無效的第一個字元「%c」"