+commit 2a0e59c07aaf3788ace907e62a1b5140e919992f
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue Apr 16 19:56:26 2013 +0100
+
+ Release JSON-GLib 0.16.0 (stable)
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 55fdc3aa8fcbebd424926eca9a912caa3f41acdf
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue Apr 16 19:59:41 2013 +0100
+
+ docs: Fix xinclude fallback for annotation glossary
+
+ doc/reference/json-glib-docs.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d4e864799773ebc047219482d474f894f151eb93
+Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
+Date: Mon Apr 1 18:32:26 2013 +0200
+
+ Add Esperanto translation
+
+ po/eo.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 170 insertions(+)
+
+commit 183dac4f69c44a46d5634f82a773a41a3a449a5b
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date: Thu Mar 21 00:04:11 2013 +0900
+
+ Updated Korean translation
+
+ po/ko.po | 67 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 34 insertions(+), 33 deletions(-)
+
+commit 5bc2060d2c433622c5b7df44d0dd3cb7fc3d7a17
+Author: Victor Ibragimov <victor.ibragimov@gmail.com>
+Date: Tue Mar 19 22:36:30 2013 +0100
+
+ [l10n] Added Tadjik translation
+
+ po/tg.po | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 155 insertions(+)
+
+commit 7b7ac31d069d0cda5ec5d8d16ef1e2a9f43c8bfe
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date: Sun Mar 17 20:23:41 2013 +0200
+
+ Updated Latvian translation
+
+ po/lv.po | 65 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 33 insertions(+), 32 deletions(-)
+
+commit 474cd483c4ab292bbd3ceab9f411159989e743be
+Author: Ask H. Larsen <asklarsen@gmail.com>
+Date: Sun Mar 17 08:27:33 2013 +0100
+
+ Updated Danish translation
+
+ po/da.po | 67 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 34 insertions(+), 33 deletions(-)
+
+commit 879ed51b7c2629a3f1c512bb787dd79e097dc7ca
+Author: Duarte Loreto <happyguy_pt@hotmail.com>
+Date: Fri Mar 15 01:00:51 2013 +0000
+
+ Updated Portuguese translation and converted to New Spelling (Novo AO)
+
+ po/pt.po | 98 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 49 insertions(+), 49 deletions(-)
+
+commit e1a55fde8a6a5cc0f1fe44ccfd54c60dd8a7aec6
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Wed Mar 13 14:41:23 2013 -0300
+
+ variant: Fix documentation and annotations for deserialize()
+
+ The returned GVariant when deserializing from JSON has a floating
+ reference that needs to be sunk.
+
+ json-glib/json-gvariant.c | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+commit 8bba53c334b26811083c6d786a527afce965f25d
+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Thu Mar 7 17:30:10 2013 +0800
+
+ Update Visual Studio Solution Files
+
+ Integrate the utility projects to build the introspection files, where one
+ can use to build the introspection files directly from the Visual Studio
+ IDE if desired. Note that the introspection files are not built by default
+ in a standard Visual Studio build process for JSON-GLib.
+
+ build/win32/vs10/json-glib.sln | 6 ++++++
+ build/win32/vs9/json-glib.sln | 9 +++++++++
+ 2 files changed, 15 insertions(+)
+
+commit 522a8b40915531ce6fe3075f5f83e6aea984e019
+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Thu Mar 7 17:28:12 2013 +0800
+
+ Visual Studio Builds: Support building introspection files
+
+ Add a Windows .bat and a python script to create a file list of headers
+ and sources to be processed by g-ir-scanner, and to call g-ir-scanner to
+ build the introspection files for JSON-GLib. This will enable one to build
+ the introspection files with Visual Studio builds without needing a
+ BASH-style shell like MSYS.
+
+ Also add utility Visual Studio projects that can be used to call the
+ Windows .bat to build the introspection files, for convenience
+
+ build/win32/Makefile.am | 6 +-
+ build/win32/gen-file-list-jsonglib.py | 114 +++++++++++++++++++++++++++++
+ build/win32/gengir_jsonglib.bat | 132 ++++++++++++++++++++++++++++++++++
+ build/win32/vs10/Makefile.am | 1 +
+ build/win32/vs10/gengir.vcxproj | 104 +++++++++++++++++++++++++++
+ build/win32/vs9/Makefile.am | 1 +
+ build/win32/vs9/gengir.vcproj | 77 ++++++++++++++++++++
+ 7 files changed, 434 insertions(+), 1 deletion(-)
+
+commit a518623439d8bcb7052affe7aeef9783e026138b
+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Thu Mar 7 17:22:37 2013 +0800
+
+ Update build/win32/config.h.win32(.in)
+
+ Make its entries reflect the entries that are requested in the config.h.in
+ that was generated with autotools
+
+ build/win32/config.h.win32.in | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+commit 3350c6ee0767fa18ab3ccd7c699ba5a397418573
+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Thu Mar 7 17:21:04 2013 +0800
+
+ Update Visual Studio Property Sheets
+
+ -Replace JsonGlibVersion with ApiVersion, to be consistent with the Visual
+ Studio property sheets of the other parts of the GTK+/Clutter stack, and
+ update the corresponding projects
+ -Add directives in the property sheets so that we use later to build the
+ introspection files
+
+ build/win32/vs10/json-glib.props | 69 +++++++++++++++++++++++-------------
+ build/win32/vs10/json-glib.vcxprojin | 8 ++---
+ build/win32/vs9/json-glib.vcprojin | 8 ++---
+ build/win32/vs9/json-glib.vsprops | 59 ++++++++++++++++++++----------
+ 4 files changed, 93 insertions(+), 51 deletions(-)
+
+commit 10bc48945678b1c61f42a2860b1ca89c0d9d248f
+Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
+Date: Mon Mar 4 22:53:50 2013 +0100
+
+ Updated Basque language
+
+ po/eu.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+commit ebe85c769b380d442ec246edebaccf8a5186b366
+Author: A S Alam <aalam@users.sf.net>
+Date: Tue Feb 26 07:28:55 2013 +0530
+
+ Punjabi: Translation updated (aalam)
+
+ po/pa.po | 49 +++++++++++++++++++++++++------------------------
+ 1 file changed, 25 insertions(+), 24 deletions(-)
+
+commit 96c3822becd754851c0370c5dcb983c2579ad9d7
+Author: Alexandre Franke <alexandre.franke@gmail.com>
+Date: Wed Feb 20 20:12:59 2013 +0100
+
+ Update French translation
+
+ po/fr.po | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+commit 97e0e0194a7273e928fe3e73a875382fb5810333
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date: Sun Feb 17 20:13:33 2013 +0100
+
+ Updated Polish translation
+
+ po/pl.po | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 078f26ac09eec7aa5b00823dedb56c5c934f9aa2
+Author: Anish A <aneesh.nl@gmail.com>
+Date: Thu Feb 14 21:23:15 2013 +0400
+
+ Updated Malayalam Localization
+
+ po/ml.po | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+commit eba4dfe745e14f8a27339d2b9962168aeec25b94
+Author: Evan Nemerson <evan@coeus-group.com>
+Date: Mon Feb 11 01:55:51 2013 -0800
+
+ node: add (transfer none) annotations to the new typed initializers
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=693575
+
+ json-glib/json-node.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 53c92e81be7d6d59d177ec2e78ee5e3bd86bc6ac
+Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
+Date: Mon Feb 4 20:33:01 2013 +0800
+
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+ po/zh_HK.po | 67 ++++++++++++++++++++++++++++++-------------------------------
+ po/zh_TW.po | 67 ++++++++++++++++++++++++++++++-------------------------------
+ 2 files changed, 66 insertions(+), 68 deletions(-)
+
+commit 437418bc7f5f176cd3cee6f88aaa51f9b69ac9ae
+Author: Gheyret Kenji <gheyret@gmail.com>
+Date: Sat Jan 26 09:48:04 2013 +0900
+
+ Updated Uyghur translation
+
+ Signed-off-by: Gheyret Kenji <gheyret@gmail.com>
+
+ po/ug.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit e4653a5c9ae70621bfba6314e4c538a8415923a1
+Author: Gheyret Kenji <gheyret@gmail.com>
+Date: Sat Jan 26 09:45:46 2013 +0900
+
+ Updated Uyghur translation
+
+ Signed-off-by: Gheyret Kenji <gheyret@gmail.com>
+
+ po/ug.po | 52 ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
+
+commit e2172751e967d1dbbeb618eda68c4dc0aec709f3
+Author: Milo Casagrande <milo@ubuntu.com>
+Date: Thu Jan 24 22:36:47 2013 +0100
+
+ [l10n] Updated Italian translation.
+
+ po/it.po | 68 +++++++++++++++++++++++++++-------------------------------------
+ 1 file changed, 29 insertions(+), 39 deletions(-)
+
+commit eff4e0997aace5b99ab1bfd1dde9dbd3c8127b7d
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date: Wed Jan 23 14:01:55 2013 +0100
+
+ Updated Norwegian bokmål translation
+
+ po/nb.po | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+commit 36abcad4a2cb7cfd0cdbd2298bf32d5a1d617d1b
+Author: Carles Ferrando <carles.ferrando@gmail.com>
+Date: Mon Jan 21 00:27:23 2013 +0100
+
+ [l10n] Updated Catalan (Valencian) translation
+
+ po/ca@valencia.po | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+commit 87d129518204769fc5942070fab13812008e306e
+Author: Gil Forcada <gforcada@gnome.org>
+Date: Mon Jan 21 00:26:24 2013 +0100
+
+ [l10n] Updated Catalan translation
+
+ po/ca.po | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+commit 96c57eec2d8332c72b28851bc9a72e1b61ddb2c5
+Author: Gheyret Kenji <gheyret@gmail.com>
+Date: Sun Jan 20 11:49:52 2013 +0900
+
+ Uyghur translation added
+
+ Signed-off-by: Gheyret Kenji <gheyret@gmail.com>
+
+ po/ug.po | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 153 insertions(+)
+
+commit 69decac8985401f1a47ffea96f72d728e3585248
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date: Sat Jan 19 11:47:40 2013 +0100
+
+ Updated Serbian translation
+
+ po/sr.po | 71 +++++++++++++++++++++++++---------------------------------
+ po/sr@latin.po | 71 +++++++++++++++++++++++++---------------------------------
+ 2 files changed, 60 insertions(+), 82 deletions(-)
+
+commit a9bc17dc04b425888b40b5ecef6baefcf369ec84
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Jan 11 17:47:13 2013 +0000
+
+ path: Fix get all object members with wildcard
+
+ Similar to the fix that went in commit path e348b1fa, we need to fix
+ getting all the members of an object by using the wildcard notation.
+
+ json-glib/json-path.c | 2 +-
+ json-glib/tests/path.c | 28 +++++++++++++++++++++++-----
+ 2 files changed, 24 insertions(+), 6 deletions(-)
+
+commit e348b1fa88823ddb18fb8d2a2d1acea94c9f9448
+Author: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date: Fri Jan 11 15:03:08 2013 +0000
+
+ path: Fix get all array elements with wildcard
+
+ Using the same data as in tests, asking for $['store']['book'][*] JSON path
+ should return all the book objects in an array.
+
+ But that array is returned inside another array, dupped several times.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=691557
+
+ json-glib/json-path.c | 2 +-
+ json-glib/tests/path.c | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+commit f33c209e0f895b52afae5742a72cfacf104116bc
+Author: Alexander Shopov <ash@kambanaria.org>
+Date: Tue Jan 8 21:46:02 2013 +0200
+
+ Updated Bulgarian translation
+
+ po/bg.po | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+commit 8b540ceb2f72b2e354a54bd418c378b4edc6f01a
+Author: Timur Zhamakeev <ztimur@gmail.com>
+Date: Sat Jan 5 18:25:00 2013 +0600
+
+ Updated Kyrgyz translation.
+
+ po/ky.po | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit 62958e52b8b60defe3f701c6b4d0680a83528312
+Author: Balázs Úr <urbalazs@src.gnome.org>
+Date: Mon Dec 31 16:47:49 2012 +0100
+
+ Updated Hungarian translation
+
+ po/hu.po | 68 ++++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 38 insertions(+), 30 deletions(-)
+
+commit b75a912ebfac50a07a3c6c3669b1e485de9df90a
+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Wed Dec 26 10:57:56 2012 +0800
+
+ Fix VS 2008 poperty sheet
+
+ A 
\ris required for each line of command for this, which stands
+ for newline. :|
+
+ build/win32/vs9/json-glib.vsprops | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 881ba4e89ae88dfad1d91d693bb45af0ba5492fa
+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Fri Dec 14 19:35:11 2012 +0800
+
+ Cleanup/fix Visual C++ build files
+
+ -Make all projects build with MultiByte character set, to be consistent
+ with GLib.
+ -Generate .def in the intermediate directory, instead of json-glib/
+ -Get rid of some unwanted cruft in many of the Win32 (32-bit) configs in
+ various Visual C++ 2008 files.
+ -Some cosmetic changes to Visual C++ 2010 solution file.
+ -Fix "installation" folder
+
+ build/win32/vs10/array.vcxproj | 4 +-
+ build/win32/vs10/boxed.vcxproj | 4 +-
+ build/win32/vs10/builder.vcxproj | 4 +-
+ build/win32/vs10/generator.vcxproj | 4 +-
+ build/win32/vs10/gvariant.vcxproj | 4 +-
+ build/win32/vs10/json-glib.props | 11 +++++-
+ build/win32/vs10/json-glib.sln | 2 +-
+ build/win32/vs10/json-glib.vcxprojin | 8 ++--
+ build/win32/vs10/node.vcxproj | 4 +-
+ build/win32/vs10/object.vcxproj | 4 +-
+ build/win32/vs10/parser.vcxproj | 4 +-
+ build/win32/vs10/path.vcxproj | 4 +-
+ build/win32/vs10/reader.vcxproj | 4 +-
+ build/win32/vs10/serialize-complex.vcxproj | 4 +-
+ build/win32/vs10/serialize-full.vcxproj | 4 +-
+ build/win32/vs10/serialize-simple.vcxproj | 4 +-
+ build/win32/vs9/array.vcproj | 8 +---
+ build/win32/vs9/boxed.vcproj | 8 +---
+ build/win32/vs9/builder.vcproj | 8 +---
+ build/win32/vs9/generator.vcproj | 8 +---
+ build/win32/vs9/gvariant.vcproj | 4 +-
+ build/win32/vs9/json-glib.vcprojin | 12 ++----
+ build/win32/vs9/json-glib.vsprops | 59 ++++++++++++++++++------------
+ build/win32/vs9/node.vcproj | 8 +---
+ build/win32/vs9/object.vcproj | 8 +---
+ build/win32/vs9/parser.vcproj | 8 +---
+ build/win32/vs9/path.vcproj | 4 +-
+ build/win32/vs9/reader.vcproj | 8 +---
+ build/win32/vs9/serialize-complex.vcproj | 8 +---
+ build/win32/vs9/serialize-full.vcproj | 8 +---
+ build/win32/vs9/serialize-simple.vcproj | 8 +---
+ 31 files changed, 105 insertions(+), 135 deletions(-)
+
+commit 59a3e4ef763c2fb312d931fe1843638be84421c8
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date: Tue Nov 27 17:15:50 2012 +0100
+
+ Updated Polish translation
+
+ po/pl.po | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+commit c288498a8c39c2bcd5513cfb5612cb1de8e19806
+Author: Pavol Klačanský <pavol@klacansky.com>
+Date: Sun Nov 18 23:34:20 2012 +0100
+
+ Updated slovak translation
+
+ po/sk.po | 21 ++++++++++-----------
+ 1 file changed, 10 insertions(+), 11 deletions(-)
+
+commit e9504191e69ac004f2f1caeeed5e1b7f9ed903d7
+Author: Pavol Klačanský <pavol@klacansky.com>
+Date: Sat Nov 17 00:22:34 2012 +0100
+
+ Updated slovak translation
+
+ po/sk.po | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 160 insertions(+)
+
+commit ef4f7685307842e3723498b7daaff8536c9dc58e
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Wed Nov 7 18:48:25 2012 +0000
+
+ build: Bump up the requirement for GLib
+
+ We need symbols from GLib 2.34 for the test suite.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6838ee9b2a7ac7a2366a6570dc1abc7a711d9440
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Mon Nov 5 12:11:13 2012 +0000
+
+ build: Use the symbols file to generate our public ABI
+
+ Instead of a regular expression. This allows us to catch ABI issues
+ immediately, without using the ABI check, while building JSON-GLib,
+ even on *nix.
+
+ json-glib/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 2b8e9ef835f1e99ff791bd5d5ec579e470465f46
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Mon Nov 5 12:11:01 2012 +0000
+
+ symbols: Re-sort
+
+ json-glib/json-glib.symbols | 382 ++++++++++++++++++++++----------------------
+ 1 file changed, 191 insertions(+), 191 deletions(-)
+
+commit de5e62d3a2826499ab67df21162223ecd1167c5e
+Author: Marek Černocký <marek@manet.cz>
+Date: Mon Nov 5 16:15:05 2012 +0100
+
+ Updated Czech translation
+
+ po/cs.po | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 3144ead7f256f1172278f74c9c2035884e2eca50
+Author: Marek Černocký <marek@manet.cz>
+Date: Mon Nov 5 16:13:17 2012 +0100
+
+ Updated Czech translation
+
+ po/cs.po | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+commit 447c3684cb99f1f8acda4a0273612ec5a065f8d7
+Author: Rafael Ferreira <rafael.f.f1@gmail.com>
+Date: Mon Nov 5 12:40:56 2012 -0200
+
+ Updated Brazilian Portuguese Translation
+
+ po/pt_BR.po | 67 +++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 32 insertions(+), 35 deletions(-)
+
+commit 02a081f6dc83e8f5f083722ef8bb3bfb47a746c2
+Author: Yuri Myasoedov <omerta13@yandex.ru>
+Date: Sun Nov 4 21:15:38 2012 +0400
+
+ Updated Russian translation
+
+ po/ru.po | 82 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 41 insertions(+), 41 deletions(-)
+
+commit f69e9b58cc8ad8d37369fd3f60db8d8e9847b1f1
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date: Sat Nov 3 09:20:27 2012 +0100
+
+ Updated Serbian translation
+
+ po/sr.po | 49 ++++++++++++++++++++++++++++++-------------------
+ po/sr@latin.po | 49 ++++++++++++++++++++++++++++++-------------------
+ 2 files changed, 60 insertions(+), 38 deletions(-)
+
+commit b16cb3f338f625ed9e997dce9ad26a4568a082be
+Author: Tom Tryfonidis <tomtryf@gmail.com>
+Date: Thu Nov 1 11:43:51 2012 +0200
+
+ Added Greek translation
+
+ po/el.po | 77 +++++++++++++++++++++++++++++++---------------------------------
+ 1 file changed, 37 insertions(+), 40 deletions(-)
+
+commit 7552833d503db0aa94e4ebc59094e9341e8920af
+Author: Fran Diéguez <fran.dieguez@mabishu.com>
+Date: Wed Oct 31 11:04:11 2012 +0100
+
+ Updated Galician translations
+
+ po/gl.po | 74 +++++++++++++++++++++++++++++++---------------------------------
+ 1 file changed, 36 insertions(+), 38 deletions(-)
+
+commit 6999123568e522dc57c76799aff90a285a52c5dd
+Author: Wolfgang Stoeggl <c72578@yahoo.de>
+Date: Tue Oct 30 19:01:34 2012 +0100
+
+ Updated German translation
+
+ po/de.po | 78 +++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 40 insertions(+), 38 deletions(-)
+
+commit b3569e022b36ff8be4379a163c1694df0ac66d8e
+Author: Mattias Põldaru <mahfiaz@gmail.com>
+Date: Tue Oct 30 15:36:23 2012 +0200
+
+ [l10n] Updated Estonian translation
+
+ po/et.po | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 53835c75028b578a5b565280ae62971990c1355f
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date: Sun Oct 28 13:31:25 2012 +0100
+
+ Updated Spanish translation
+
+ po/es.po | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+commit 28e6bff54d2ddc64e7662d96365d2faf615ed0b5
+Author: Marek Černocký <marek@manet.cz>
+Date: Sun Oct 28 11:15:27 2012 +0100
+
+ Updated Czech translation
+
+ po/cs.po | 39 ++++++++++++++-------------------------
+ 1 file changed, 14 insertions(+), 25 deletions(-)
+
+commit 64fe683c440d7ec7140fd27f53fbaf54da37b249
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Oct 27 12:18:53 2012 +0100
+
+ tests: Put g_type_init() under conditional compilation
+
+ Starting from GLib 2.36, g_type_init() is going to be deprecated (the
+ type system will be initialized as soon as libgobject is paged in, using
+ constructors). As I don't want to bump dependencies just for that, the
+ call to g_type_init() should be placed under a compile-time version
+ check, to keep the noise from compiler warnings down.
+
+ json-glib/tests/array.c | 3 +++
+ json-glib/tests/boxed.c | 2 ++
+ json-glib/tests/builder.c | 2 ++
+ json-glib/tests/generator.c | 2 ++
+ json-glib/tests/gvariant.c | 2 ++
+ json-glib/tests/invalid.c | 2 ++
+ json-glib/tests/node.c | 2 ++
+ json-glib/tests/object.c | 2 ++
+ json-glib/tests/parser.c | 2 ++
+ json-glib/tests/path.c | 2 ++
+ json-glib/tests/reader.c | 2 ++
+ json-glib/tests/serialize-complex.c | 2 ++
+ json-glib/tests/serialize-full.c | 2 ++
+ json-glib/tests/serialize-simple.c | 2 ++
+ 14 files changed, 29 insertions(+)
+
+commit f50f32dcfdecd552ca353731faa0fde099569c28
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Oct 27 12:06:28 2012 +0100
+
+ Use typed initializers for JsonNode
+
+ json-glib/json-gobject.c | 115 +++++++++++++++++++++--------------------------
+ json-glib/json-parser.c | 37 ++++++++-------
+ 2 files changed, 73 insertions(+), 79 deletions(-)
+
+commit 893c30b4b8ce10c017d10bd534c38c458da4436c
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Oct 27 11:51:11 2012 +0100
+
+ Use the new typed JsonNode initializers
+
+ The typed setters in JsonArray and JsonObject should use the JsonNode
+ typed initializers.
+
+ json-glib/json-array.c | 54 +++++++++++++++++--------------------------------
+ json-glib/json-object.c | 48 +++++++++++++++++--------------------------
+ 2 files changed, 37 insertions(+), 65 deletions(-)
+
+commit 9dfb5000cad954431165e836e203e561ccb79c66
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Oct 27 11:48:58 2012 +0100
+
+ Consolidate null handling in JsonArray and JsonObject
+
+ A null value is not only valid for JSON_NODE_NULL nodes, but also for
+ JSON_NODE_ARRAY and JSON_NODE_OBJECT nodes that do not have a JsonArray
+ or a JsonObject set.
+
+ json-glib/json-array.c | 11 ++++++++++-
+ json-glib/json-object.c | 11 ++++++++++-
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+commit 615538100a42063ca0b84b5bb9c8a6a046a89e0b
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Oct 27 11:44:30 2012 +0100
+
+ node: Add typed initializers
+
+ We should simplify the JsonNode API a bit, especially when it comes to
+ initializing nodes. Instead of a two-step "new(<type>) followed by a
+ set_<type>(value)" API, we can provide a "init_<type>(value)" API that
+ can take any existing JsonNode and initialize it to the given type.
+
+ This makes the JsonNode creation more concise and reliable; it also
+ allows to implicitly re-initialize JsonNodes without requiring the user
+ to de-allocate/re-allocate them first.
+
+ doc/reference/json-glib-sections.txt | 9 ++
+ json-glib/json-glib.symbols | 9 ++
+ json-glib/json-node.c | 303 +++++++++++++++++++++++++++++++----
+ json-glib/json-types.h | 19 +++
+ 4 files changed, 306 insertions(+), 34 deletions(-)
+
+commit 3fb92bc727365bce5f99da3a150a237da4da64d6
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Oct 27 10:53:49 2012 +0100
+
+ tests/reader: Improve test coverage
+
+ json-glib/tests/reader.c | 24 +++++++++++++++++++-----
+ 1 file changed, 19 insertions(+), 5 deletions(-)
+
+commit 22275bc0c28682e6bd3022d36e0a9301aeb5ce56
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Oct 27 10:52:41 2012 +0100
+
+ reader: "null" is a value
+
+ Even if we have a special JsonNode for it. The json_reader_is_value()
+ function should return TRUE for 'null' nodes as well.
+
+ json-glib/json-reader.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 9c26d466f4bbdde00225f2782f041668b1536213
+Author: Andika Triwidada <andika@gmail.com>
+Date: Sat Oct 27 13:31:33 2012 +0700
+
+ Updated Indonesian translation
+
+ po/id.po | 74 +++++++++++++++++++++++++++-------------------------------------
+ 1 file changed, 31 insertions(+), 43 deletions(-)
+
+commit 4e73239b572fcc0eb4ff6639ee3bbde05d19d404
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date: Sat Oct 27 05:27:15 2012 +0200
+
+ Updated Serbian translation
+
+ po/sr.po | 17 +++++++++--------
+ po/sr@latin.po | 17 +++++++++--------
+ 2 files changed, 18 insertions(+), 16 deletions(-)
+
+commit dee67875c1ef981bd3dc56e652df93d4a6f4feda
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 17:59:42 2012 +0100
+
+ scanner: Remove unused functions
+
+ JsonScanner is an internal, modified copy of GScanner; we don't need a
+ bunch of the provided functions, as the type and its related API are
+ meant for internal use only.
+
+ Fewer functions == better coverage == less code to maintain.
+
+ json-glib/json-parser.c | 52 +++----
+ json-glib/json-scanner.c | 393 ++++-------------------------------------------
+ json-glib/json-scanner.h | 45 +-----
+ 3 files changed, 59 insertions(+), 431 deletions(-)
+
+commit e83baeab7ce16db4597247e793932fd2e507e855
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 17:21:48 2012 +0100
+
+ tests: Improve coverage
+
+ json-glib/tests/serialize-full.c | 156 ++++++++++++++++++++++++++-------------
+ 1 file changed, 104 insertions(+), 52 deletions(-)
+
+commit 1e7a2ef9be305e8b1db806f364d18f704ca75a64
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 17:20:43 2012 +0100
+
+ gobject: Use JsonSerializable API
+
+ Instead of directly accessing the vfunc from the interface vtable.
+
+ json-glib/json-gobject.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+commit 4fe6c5977d95c37c693d4f0b1d2dd90ae564b8b3
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 16:40:59 2012 +0100
+
+ tests: Improve coverage
+
+ json-glib/tests/array.c | 4 +++
+ json-glib/tests/builder.c | 9 +++++-
+ json-glib/tests/generator.c | 69 ++++++++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 80 insertions(+), 2 deletions(-)
+
+commit 31b8e9c9410a90c387aaf6c9c79e5affc1a1b1be
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 16:40:10 2012 +0100
+
+ builder: Conform to the coding style
+
+ Function arguments should be aligned on different lines.
+
+ json-glib/json-builder.c | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+commit b0c087d1cc88938bc7e6bb1350a175b1ed103e62
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 11:06:26 2012 +0100
+
+ tests: Improve coverage
+
+ json-glib/tests/array.c | 30 ++++++++++++++++++++++++++++++
+ json-glib/tests/object.c | 13 +++++++++++++
+ 2 files changed, 43 insertions(+)
+
+commit cce1435c280dbf63b0dbb8c9176e062c539aa9f9
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 11:04:47 2012 +0100
+
+ array: Relax preconditions on array and object methods
+
+ Similarly to what we did for the add_string_element(), we need to relax
+ the preconditions for add_array_element() and add_object_element().
+
+ json-glib/json-array.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+commit bf273f396c640c17da9f742433b4855232b2062e
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 10:59:16 2012 +0100
+
+ array: Relax add_string_element() preconditions
+
+ The add_string_element() allows passing a NULL string as a shortcut to
+ create a 'null' node; the preconditions on the arguments are too strict.
+
+ json-glib/json-array.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 2dec8604ee58571ccc902aeb27004adf6a436ff5
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 10:15:35 2012 +0100
+
+ tests/parser: Check negative numeric values
+
+ This is the positive equivalent of the test case inside the invalid test
+ unit.
+
+ json-glib/tests/parser.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+commit b9e93111a1200492b71476f7b3a1c60588a90a15
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 10:10:53 2012 +0100
+
+ tests/invalid: Improve test coverage
+
+ json-glib/tests/invalid.c | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+commit 028e540bc2b78f87e5a1d2f0c36126b7636f2809
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 10:10:01 2012 +0100
+
+ parser: Empty member names are not valid
+
+ When parsing a JSON object, a member name has to be a valid string, not
+ an empty one.
+
+ json-glib/json-parser.c | 13 +++++++++++++
+ json-glib/json-parser.h | 4 +++-
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+commit 32d7c034dda3ccce05bec2bab0007ff0d65729ab
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri Oct 26 09:15:11 2012 +0100
+
+ build: Fix test-report generation
+
+ We need to include the revision and date tags.
+
+ build/autotools/Makefile.am.gtest | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+commit 43a27e66bd903a4d68a31e37c3ce04103ed49258
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Fri Oct 26 15:41:43 2012 +0530
+
+ Assamese translation updatedas.po
+
+ po/as.po | 47 ++++++++++++++++++++++-------------------------
+ 1 file changed, 22 insertions(+), 25 deletions(-)
+
+commit ef6b1e9bb79ae0f07d412a876fd48e27854e9d38
+Author: Aurimas Černius <aurisc4@gmail.com>
+Date: Thu Oct 25 23:04:46 2012 +0300
+
+ Updated Lithuanian translation
+
+ po/lt.po | 41 +++++++++++++++--------------------------
+ 1 file changed, 15 insertions(+), 26 deletions(-)
+
+commit 1236c7493093357485c8ddc01eb6431d4ae7b842
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date: Thu Oct 25 19:22:49 2012 +0200
+
+ Updated Slovenian translation
+
+ po/sl.po | 46 +++++++++++++++++++++-------------------------
+ 1 file changed, 21 insertions(+), 25 deletions(-)
+
+commit 46b677b4fd818ba9343b8b569f5b951d3d8ac0a3
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu Oct 25 17:39:38 2012 +0100
+
+ tests/invalid: Add more invalid JSON tests
+
+ json-glib/tests/invalid.c | 113 +++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 96 insertions(+), 17 deletions(-)
+
+commit 977c998929f4d82d93acd3ea0f99c04006e45db0
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu Oct 25 17:26:25 2012 +0100
+
+ tests/invalid: Check invalid assignments
+
+ json-glib/tests/invalid.c | 44 ++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 40 insertions(+), 4 deletions(-)
+
+commit 77ed79385795d93776e6299b9add3940ceee4245
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu Oct 25 17:21:55 2012 +0100
+
+ parser: Use error codes for invalid assignments
+
+ In case we're parsing an assignment we should use the 'invalid bareword'
+ error code.
+
+ json-glib/json-parser.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 6ebe68eb539a119f99205593b0246399923daef7
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu Oct 25 17:10:39 2012 +0100
+
+ tests: Move the invalid JSON unit to its own file
+
+ Instead of putting it inside the parser unit test.
+
+ json-glib/tests/Makefile.am | 1 +
+ json-glib/tests/invalid.c | 93 +++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/tests/parser.c | 52 -------------------------
+ 3 files changed, 94 insertions(+), 52 deletions(-)
+
+commit 6e9c38dd0c82c322a9e98315cb22c2b771b1830f
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu Oct 25 17:08:58 2012 +0100
+
+ parser: Consolidate value parsing
+
+ Instead of doing a preliminary check when parsing arrays and objects, we
+ should just call json_parse_value() and let it handle all the valid
+ values and eventual error cases. This simplifies error handling and
+ makes it more reliable.
+
+ json-glib/json-parser.c | 37 ++++++++++++-------------------------
+ 1 file changed, 12 insertions(+), 25 deletions(-)
+
+commit 5f6ef962097916ae2908e9190d5ba62533ae33ca
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu Oct 25 17:07:16 2012 +0100
+
+ parser: Show the column in the error message
+
+ For JSON parsed from data (which tends to be in a single line) the
+ column holds more information than the line.
+
+ json-glib/json-parser.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 1d236453b2569cb2cb5bbc80fde1c72e7a101826
+Author: Miguel Angel Cabrera Moya <madmac2501@gmail.com>
+Date: Sun Oct 14 12:18:30 2012 +0200
+
+ parser: Fix small leak in json_parse_statement
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=686096
+
+ json-glib/json-parser.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 626908526f9766e4f612bb4b893b83b7084766dc
+Author: Sasi Bhushan Boddepalli <sasi@swecha.net>
+Date: Tue Oct 9 21:36:45 2012 +0530
+
+ Updated Telugu Translation
+
+ po/te.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+commit 57bbb1cb7f75720a4d7ba0399e5a156322d34666
+Author: Timur Zhamakeev <ztimur@gmail.com>
+Date: Thu Sep 27 11:56:23 2012 +0600
+
+ Added Kyrgyz translation
+
+ po/ky.po | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 160 insertions(+)
+
+commit 3f840ae31641ad800872e953ee772777e746925c
+Author: Mattias Põldaru <mahfiaz@gmail.com>
+Date: Mon Sep 24 11:26:41 2012 +0300
+
+ [l10n] Updated Estonian translation
+
+ po/et.po | 61 +++++++++++++------------------------------------------------
+ 1 file changed, 13 insertions(+), 48 deletions(-)
+
+commit 426d9f141f5e7c975324d42abdab774b5e9587b2
+Author: Mattias Põldaru <mahfiaz@gmail.com>
+Date: Mon Sep 24 10:57:10 2012 +0300
+
+ [l10n] Updated Estonian translation
+
+ po/et.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+commit b2f3ef4cf26e3bae47c82d5c3c7bf79ea762563f
+Author: Sayak Sarkar <sayak.bugsmith@gmail.com>
+Date: Mon Sep 24 10:54:45 2012 +0530
+
+ Added Bengali India Translation
+
+ po/bn_IN.po | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 156 insertions(+)
+
+commit 655794941dbeac7f65a3ae8514fc75536c9f5ed5
+Author: A S Alam <aalam@users.sf.net>
+Date: Mon Sep 24 09:00:08 2012 +0530
+
+ update Punjabi Translation
+
+ po/pa.po | 68 ++++++++++++++++++++++++++--------------------------------------
+ 1 file changed, 28 insertions(+), 40 deletions(-)
+
+commit 80c6eac77df27b739e7291e3ec7ba6fd4e62c143
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date: Mon Sep 24 02:10:04 2012 +0300
+
+ Added Latvian translation
+
+ po/lv.po | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 159 insertions(+)
+
+commit f9feca98c714239d7a361597be6fe58b407e1037
+Author: Ani Peter <apeter@redhat.com>
+Date: Sun Sep 23 01:10:17 2012 +0530
+
+ Updated Malayalam file
+
+ po/ml.po | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 155 insertions(+)
+
+commit 7abcdadd9b49b0db881702724ef81fe571d0d750
+Author: Carles Ferrando <carles.ferrando@gmail.com>
+Date: Fri Sep 21 20:05:58 2012 +0200
+
+ [l10n]Added Catalan (Valencian) translation
+
+ po/ca@valencia.po | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+commit d1d83f78922be9e5ee98e58410c3fa998ca24d13
+Author: Gil Forcada <gforcada@gnome.org>
+Date: Fri Sep 21 20:05:57 2012 +0200
+
+ [l10n] Added Catalan translation
+
+ po/ca.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+commit da276c3c9f7f2d7b4abce85cbbe91258b595b8ef
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date: Sat Sep 22 02:53:04 2012 +0900
+
+ Added Korean translation
+
+ po/ko.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 156 insertions(+)
+
+commit fef47f834db55a503658247b530d378ea5396949
+Author: Chandan Kumar <chandankumar.093047@gmail.com>
+Date: Thu Sep 20 10:35:54 2012 +0530
+
+ Updated HINDI translation
+
+ po/hi.po | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 160 insertions(+)
+
+commit 2f14b54261746b8384df992c6eed232bf8628021
+Author: Ivaylo Valkov <ivaylo@e-valkov.org>
+Date: Tue Sep 18 19:29:36 2012 +0300
+
+ Updated Bulgarian translation
+
+ po/bg.po | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 157 insertions(+)
+
+commit 10e8cd6de555866cb7152e3d8b818db796db1261
+Author: Gabor Kelemen <kelemeng@gnome.hu>
+Date: Tue Sep 18 01:38:19 2012 +0200
+
+ Added Hungarian translation
+
+ po/hu.po | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 153 insertions(+)
+
+commit 33ee7e91169c6943199739dce9a8f097fea770b3
+Author: Ask H. Larsen <asklarsen@gmail.com>
+Date: Sun Sep 16 13:43:53 2012 +0200
+
+ Updated Danish translation
+
+ po/da.po | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 162 insertions(+)
+
+commit 4b27aa4e36193757f2d4ddc14ff07f6a47ebe529
+Author: Duarte Loreto <happyguy_pt@hotmail.com>
+Date: Sun Sep 9 11:29:56 2012 +0100
+
+ Updated Portuguese translation
+
+ po/pt.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 156 insertions(+)
+
+commit 3b21390c1c16d701bb31678919ca639075ff2729
+Author: Alexandre Franke <alexandre.franke@gmail.com>
+Date: Thu Sep 6 12:22:09 2012 +0200
+
+ Update French translation
+
+ po/fr.po | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 174 insertions(+)
+
+commit 2d376ded0367ee77382a92c58f3d7852590ed0a8
+Author: Bruce Cowan <bruce@bcowan.me.uk>
+Date: Wed Sep 5 13:45:45 2012 +0100
+
+ Added British English translation
+
+ po/en_GB.po | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 160 insertions(+)
+
+commit 7b837e9ac065d6a117c52cb25bb285fd2bb7e89a
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date: Tue Sep 4 18:18:07 2012 +0200
+
+ Updated Polish translation
+
+ po/pl.po | 84 ++++++++++++++++++++++++++++------------------------------------
+ 1 file changed, 37 insertions(+), 47 deletions(-)
+
+commit b6497b1d5ce1efa9a6f90b495472aaa917245653
+Author: Daniel Korostil <ted.korostiled@gmail.com>
+Date: Fri Aug 17 19:45:07 2012 +0300
+
+ Added uk translation
+
+ po/uk.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+commit 31ca069867c5c94ffd7d42a3f91eb3828581e7a6
+Author: ManojKumar Giri <mgiri@redhat.com>
+Date: Thu Aug 9 18:32:16 2012 +0530
+
+ Updated Odia Translation.
+
+ po/or.po | 35 +++++++++++++++++++----------------
+ 1 file changed, 19 insertions(+), 16 deletions(-)
+
+commit 62b6bb982ca8287b01c4b3d4abf2dd2ff19b8899
+Author: ManojKumar Giri <mgiri@redhat.com>
+Date: Tue Aug 7 17:38:42 2012 +0530
+
+ Added odia file into the list & Updated translation for Odia.
+
+ po/or.po | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 157 insertions(+)
+
+commit c34ddaf33f3227c5fba7a866cfa25dba2e46d275
+Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
+Date: Mon Aug 6 23:04:16 2012 +0900
+
+ [l10n] Add new Japanese translation
+
+ po/ja.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+commit 8b5f8e8e7928fac15b38b96017c729ee2143352f
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date: Wed Jul 25 16:44:55 2012 +0200
+
+ Updated Norwegian bokmål translation
+
+ po/nb.po | 34 +++++++++++-----------------------
+ 1 file changed, 11 insertions(+), 23 deletions(-)
+
+commit 6fdf403d06ac890127bca474275d0f62c02caf4f
+Author: fenghelong <fenghelongnjit@gmail.com>
+Date: Sun Jul 22 13:34:07 2012 +0800
+
+ Add Chinese simplified translation for ui
+
+ po/zh_CN.po | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 165 insertions(+)
+
+commit 2bfb6cccf626c60571643bcc2bb12e4791dd1db6
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date: Tue Jul 17 22:05:57 2012 +0200
+
+ Added Serbian translation
+
+ po/sr.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/sr@latin.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 312 insertions(+)
+
+commit 9eebf9c886ae7e1e172e3a1efd64f7aa7c79c758
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sun Jul 15 13:25:53 2012 +0100
+
+ reader: Do not do strict type validation on numeric types
+
+ JsonNode will do an implicit conversion for us.
+
+ json-glib/json-reader.c | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+commit 7819e630b8fd88d269dd75a2e0fb1aeb294aed96
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sun Jul 15 13:24:03 2012 +0100
+
+ node: Implicitly convert numeric types
+
+ When retrieving an int, a double, or a boolean, we can use the C rules
+ of implicit conversion to move from the actual stored type inside the
+ JsonValue to the requested C type.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=660795
+
+ json-glib/json-node.c | 18 ++++++++++++++++++
+ json-glib/tests/node.c | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 53 insertions(+)
+
+commit b1b50ec3ad76955651abe92696c4f4717e353840
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sun Jul 15 13:14:46 2012 +0100
+
+ generator: Use JsonValue, not GValue
+
+ We don't need to turn a JsonValue into a GValue, given that we only care
+ about the JSON types when serializing to JSON.
+
+ json-glib/json-generator.c | 33 ++++++++++++++++++---------------
+ 1 file changed, 18 insertions(+), 15 deletions(-)
+
+commit 4cb5a1d5c25e7c1e939187740897cb1969df61e8
+Author: Aurimas Černius <aurisc4@gmail.com>
+Date: Sat Jul 14 18:44:21 2012 +0300
+
+ Added Lithuanian translation
+
+ po/lt.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 170 insertions(+)
+
+commit b11ce6570570440c94e563917f55437ca7d2e071
+Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
+Date: Sat Jul 14 14:14:38 2012 +0800
+
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+ po/zh_HK.po | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/zh_TW.po | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 332 insertions(+)
+
+commit 1409517eb0081d8a56713ee8f6922974f3ca5af0
+Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
+Date: Fri Jul 13 20:30:07 2012 +0530
+
+ Assamese translation completed
+
+ po/as.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 170 insertions(+)
+
+commit 4317540f0e389370c76ccedea4ca7d15a8aa4969
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date: Tue Jul 10 08:29:46 2012 +0200
+
+ Updated Norwegian bokmål translation
+
+ po/nb.po | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+commit d713da8c3207d7df0c8632924887144fe22e6e0e
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Jun 30 15:27:03 2012 +0100
+
+ doap: Change my email address to @gnome.org
+
+ json-glib.doap | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit c618e6554e28a7a4c6924b2f050daebe1580c6c0
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat Jun 30 15:22:20 2012 +0100
+
+ Post-release version bump to 0.15.3
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 2d129e5d700db4e0932b3cdd0260ab173f13901e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat Jun 30 15:19:49 2012 +0100
Release JSON-GLib 0.15.2 (snapshot)
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4bb7b70c1ec13eb67b3984b684b2ca45b340ee9b
The deprecation macros should be in the private section.
- doc/reference/json-glib-sections.txt | 2 ++
+ doc/reference/json-glib-sections.txt | 2 ++
1 file changed, 2 insertions(+)
commit 9c5c46228d67884a0c26557f7471c5c24da14baa
NEWS: Update
- NEWS | 11 +++++++++++
+ NEWS | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 460a9f3e290be0d5139571492c54ce2b7078cb1f
Use autoreconf instead.
- autogen.sh | 49 ++++++++++++++++++++++++++++++++++++++++---------
+ autogen.sh | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 40 insertions(+), 9 deletions(-)
commit c6011722e55c9f03fa43e213b467ee3c1b89b2ef
symbols: Add missing functions
- json-glib/json-glib.symbols | 15 ++++++++++++++-
+ json-glib/json-glib.symbols | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit f91117fcc066fb20204aa34c979d7fb199f0f38a
is up to date and b) we're not unintentionally leaking private symbols
to the outside world.
- configure.ac | 13 ++++++++++++-
- json-glib/Makefile.am | 6 ++++++
- json-glib/abicheck.sh | 6 ++++++
+ configure.ac | 13 ++++++++++++-
+ json-glib/Makefile.am | 6 ++++++
+ json-glib/abicheck.sh | 6 ++++++
3 files changed, 24 insertions(+), 1 deletion(-)
commit d52cd977c725f7f8aa22eef91b6305255357eaf2
The JsonScanner API is purely internal; the symbols it exposes should
not end up in the shared library ABI.
- json-glib/json-scanner.h | 21 +++++++++++++++++++++
+ json-glib/json-scanner.h | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
commit b6aad8b53e9250c6b7e9c8c7302c5f8bde3a2c72
Improve test coverage
- json-glib/json-node.c | 9 ++++-----
- json-glib/tests/node.c | 18 ++++++++++++++++++
- json-glib/tests/object.c | 2 ++
+ json-glib/json-node.c | 9 ++++-----
+ json-glib/tests/node.c | 18 ++++++++++++++++++
+ json-glib/tests/object.c | 2 ++
3 files changed, 24 insertions(+), 5 deletions(-)
commit 9fd65a138d6ec46b94eaf807f9c87ea5ada11cf0
With lcov we get nicer reporting tools, with HTML output.
- .gitignore | 2 +
- Makefile.am | 26 ++++++++-
- README.md | 1 +
- build/autotools/Makefile.am | 1 -
- build/autotools/Makefile.am.gcov | 35 ------------
- configure.ac | 112 +++++++++++++++++++++++++++++++-------
- json-glib/Makefile.am | 7 +--
+ .gitignore | 2 +
+ Makefile.am | 26 ++++++++-
+ README.md | 1 +
+ build/autotools/Makefile.am | 1 -
+ build/autotools/Makefile.am.gcov | 35 ------------
+ configure.ac | 112 +++++++++++++++++++++++++++++++--------
+ json-glib/Makefile.am | 7 +--
7 files changed, 120 insertions(+), 64 deletions(-)
commit c135d9ea1b143382fe1372be547cf5ea76444445
tests: Add more coverage to JsonNode
- json-glib/tests/node.c | 113 +++++++++++++++++++++++++++++++++++++++++++++---
+ json-glib/tests/node.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 107 insertions(+), 6 deletions(-)
commit c836800166f2b40e605bb497d7d6e884ae85254c
GValue to store values inside a JsonNode, giving us a simpler, reference
counted storage type.
- json-glib/json-node.c | 177 +++++++++++++++++++---------------------
- json-glib/json-types-private.h | 2 +-
+ json-glib/json-node.c | 177 +++++++++++++++++++----------------------
+ json-glib/json-types-private.h | 2 +-
2 files changed, 83 insertions(+), 96 deletions(-)
commit 7bd24bd628df97d216436e03237fc27f85a6aa8b
already specify typed public accessors, so there's no need to complicate
the API any further.
- json-glib/Makefile.am | 5 +-
- json-glib/json-types-private.h | 78 ++++++++++++++-
- json-glib/json-value.c | 216 ++++++++++++++++++++++++++++++++++++++++
+ json-glib/Makefile.am | 5 +-
+ json-glib/json-types-private.h | 78 ++++++++++++++-
+ json-glib/json-value.c | 216 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 296 insertions(+), 3 deletions(-)
commit a62619788bbcc9035fb36e58308b28829f5650d3
Added Vietnamese translation
- po/vi.po | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/vi.po | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 166 insertions(+)
commit 487a67e2469386751eda951222b927c9ffc2fb06
Added Greek translation
- po/el.po | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/el.po | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 178 insertions(+)
commit 59247e9f8b519c97d9e4ebf67b1b117d0c1b4d66
Added Russian translation
- po/ru.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ru.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 170 insertions(+)
commit 1a7db5b528868bdf73b1e2a648134120a28bfe20
path: Pass int width for printf field width, not long
- json-glib/json-path.c | 8 ++++----
+ json-glib/json-path.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 2eb2fc40034496fa517feeb717c3ca114490c31f
l10n: Added Italian translation
- po/it.po | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/it.po | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 172 insertions(+)
commit cecb20c5e7955f62a57df802230b80d74b4d51ce
Moved id.po to proper directory
- id.po | 171 --------------------------------------------------------------
- po/id.po | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ id.po | 171 ---------------------------------------------------------------
+ po/id.po | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 171 insertions(+), 171 deletions(-)
commit ed9212a8219d0f953a5f73c1b8db099e6e0977d8
Added Indonesian translation
- id.po | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ id.po | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 171 insertions(+)
commit f3fba7486037639d37c4eb58ca9ca1a7702737ad
Added Punjabi Translaiton
- po/pa.po | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/pa.po | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 169 insertions(+)
commit a62e8a14314dbe41073c16a88b6e3d2bc491cbc0
Signed-off-by: Fran Diéguez <fran.dieguez@mabishu.com>
- po/gl.po | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/gl.po | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 168 insertions(+)
commit 6f4b0d9286c546658af9cee4fc8c075f4f713ff1
Fix "install" paths in VS property sheets
- build/win32/vs10/json-glib.props | 2 +-
- build/win32/vs9/json-glib.vsprops | 2 +-
+ build/win32/vs10/json-glib.props | 2 +-
+ build/win32/vs9/json-glib.vsprops | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 2913b0b55481768d5f6dcbbeaa7dbd468cbcf0ac
Updated Brazilian Portuguese translation
- po/pt_BR.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/pt_BR.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 170 insertions(+)
commit 64fa2598e614163fa1dd71d6d74ea2b71180cd82
Added Swedish translation
- po/sv.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/sv.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 170 insertions(+)
commit 31bac4804acba9795cd33d510725ea27a39aac23
We have deprecations warnings from the compiler, now.
- json-glib/Makefile.am | 2 +-
- json-glib/json-glib.symbols | 6 ------
- json-glib/json-gobject.h | 3 ---
- json-glib/json-types.h | 2 --
+ json-glib/Makefile.am | 2 +-
+ json-glib/json-glib.symbols | 6 ------
+ json-glib/json-gobject.h | 3 ---
+ json-glib/json-types.h | 2 --
4 files changed, 1 insertion(+), 12 deletions(-)
commit 16f9213dc29390a933b0142ea0a39d44a7a0ab02
https://bugzilla.gnome.org/show_bug.cgi?id=661128
- autogen.sh | 4 ++++
+ autogen.sh | 4 ++++
1 file changed, 4 insertions(+)
commit 424244569257c280c1926deadf266aa564b795ff
https://bugzilla.gnome.org/show_bug.cgi?id=667454
- autogen.sh | 7 -------
+ autogen.sh | 7 -------
1 file changed, 7 deletions(-)
commit fce3e04b970ec58f9d9a8ba2e5fb9712665ec17b
Updated Slovenian translation
- po/sl.po | 70 +++++++++++++++++++++++++++++++-------------------------------
+ po/sl.po | 70 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
commit b9a774d95058ae00aca03b3994f0ffc48cf50699
Added Norwegian bokmål translation
- po/nb.po | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/nb.po | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 165 insertions(+)
commit 7f343fc7c0571905afe39c06bec19edd56885620
Updated Spanish translation
- po/es.po | 29 +++++++++++++++++------------
+ po/es.po | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
commit 0b7a5b7639163573055c569109cbc91ebd77bd77
Added Slovenian translation
- po/sl.po | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/sl.po | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 175 insertions(+)
commit dab93ffeb85429157851402c51246066f95f25eb
Czech translation
- po/cs.po | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/cs.po | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 167 insertions(+)
commit 432f1b2184e0e574f3e09591f540f995a465a326
[l10n]Added Turkish translation
- po/tr.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/tr.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 170 insertions(+)
commit 9e4c685e9aa284cf67c4331942edfb8b5ace2c50
pick up glibconfig.h from a GLib version and other GLib headers from
another version accidently.
- build/win32/vs10/json-glib.props | 4 ++--
- build/win32/vs9/json-glib.vsprops | 4 ++--
+ build/win32/vs10/json-glib.props | 4 ++--
+ build/win32/vs9/json-glib.vsprops | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 89d65bb4c610b87b483b20ebb958043ea1b9d191
Updated Spanish translation
- po/es.po | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/es.po | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 167 insertions(+)
commit 84f987e94a44517a6052b7e91ed2e3c42660e295
[l10n] Added German translation
- po/de.po | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/de.po | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 172 insertions(+)
commit 88e5fdd588fe3a70e1e262bc7b414e3e527e21b6
docs: Use markdown in the README
- README | 103 --------------------------------------------------------
- README.md | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ README | 103 ---------------------------------------------------------
+ README.md | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+), 103 deletions(-)
commit 7636e9de9414304f940837ee828d23e4608e9f32
https://bugzilla.gnome.org/show_bug.cgi?id=660893
- json-glib/json-object.c | 2 +-
+ json-glib/json-object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2cb5836b99fd4f03e88568de492d1a12841c4176
It's the development cycle, we can start using GLib 2.31.
- configure.ac | 2 +-
- json-glib/json-types.h | 6 ------
+ configure.ac | 2 +-
+ json-glib/json-types.h | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
commit c2429c07107edd6acf95e80b82d968771c669c35
Instead of using a defined symbol to remove the deprecated functions
from the library, we should use compiler warnings.
- json-glib/Makefile.am | 1 -
- json-glib/json-gobject.h | 6 ++++--
- json-glib/json-types.h | 19 +++++++++++++++++--
+ json-glib/Makefile.am | 1 -
+ json-glib/json-gobject.h | 6 ++++--
+ json-glib/json-types.h | 19 +++++++++++++++++--
3 files changed, 21 insertions(+), 5 deletions(-)
commit f0dad4508b63359123926f699a66aead9c782ce1
Say goodbye to G_DISABLE_DEPRECATED and the build errors that it triggers
as warnings are now issued during the use of deprecated GLib items instead.
- build/win32/vs10/json-glib.props | 2 +-
- build/win32/vs9/json-glib.vsprops | 2 +-
+ build/win32/vs10/json-glib.props | 2 +-
+ build/win32/vs9/json-glib.vsprops | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 4ab8059df6ad106bf8958642aa1126925d79128c
The non-explicitly signed variant is deprecated.
- json-glib/json-gobject.c | 10 +++++++++-
+ json-glib/json-gobject.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit f904ad102004258dc7b839b93a7904517cc4c623
Adapt to the demise of single includes in GLib
- json-glib/json-scanner.h | 4 +---
- json-glib/tests/gvariant.c | 2 +-
- json-glib/tests/node.c | 2 +-
+ json-glib/json-scanner.h | 4 +---
+ json-glib/tests/gvariant.c | 2 +-
+ json-glib/tests/node.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
commit d23aa2f10c6580f503dfc6969f8550db9576367f
Separate intermediate folders so that errors/warnings caused by in-use files
during compilation can be avoided.
- build/win32/vs9/json-glib.vsprops | 2 +-
+ build/win32/vs9/json-glib.vsprops | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 941aff3788ed5ab32e577bcad626150f5e20ce7e
We need to find the generated version.h in the builddir.
- json-glib/Makefile.am | 2 +-
+ json-glib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c6fed3b02fb10f4fc76b594f15c56eab6ce7c591
Post-branch version bump to 0.15.1
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 35279b587f0b884fd606be77fd06e4fef919a300
Release JSON-GLib 0.14.0
- configure.ac | 4 ++--
- po/pl.po | 74 +++++++++++++++++++++++++++++-----------------------------
+ configure.ac | 4 ++--
+ po/pl.po | 74 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 39 insertions(+), 39 deletions(-)
commit 3830326516285e6e86d3fa9c58ef7531679dfec0
Added Polish translation
- po/pl.po | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/pl.po | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 172 insertions(+)
commit 67a460d9ea8b485e740d1df34943b8df974f4255
Post-release version bump to 0.13.91
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1cb4ed1fac84026a19b35ce10c54df8a6ed12959
Release JSON-GLib 0.13.90 (0.14.0-rc1)
- NEWS | 2 ++
- configure.ac | 2 +-
+ NEWS | 2 ++
+ configure.ac | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
commit 18a83ddad87c92ae78010c678a516087ba012859
build: Fix the path to the 'missing' script
- Makefile.am | 2 +-
+ Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9f75475871cc8723e0a41d6c8971f741a405cb9f
https://bugzilla.gnome.org/show_bug.cgi?id=658632
- json-glib/json-reader.c | 177 +++++++++++++++++++++++++++++++++++++++++------
- json-glib/json-reader.h | 10 ++-
+ json-glib/json-reader.c | 177 +++++++++++++++++++++++++++++++++++++++++-------
+ json-glib/json-reader.h | 10 ++-
2 files changed, 163 insertions(+), 24 deletions(-)
commit e7f2d505de39a9dbdea1a5879c13408c7a394a18
Tell people about the GNOME Live! page that outlines building
JSON-GLib and its dependencies with Visual C++.
- build/win32/vs10/README.txt | 5 +++++
- build/win32/vs9/README.txt | 5 +++++
+ build/win32/vs10/README.txt | 5 +++++
+ build/win32/vs9/README.txt | 5 +++++
2 files changed, 10 insertions(+)
commit c2f5b8bc64f9ac06b2dda8662924d88cc759718e
https://bugzilla.gnome.org/show_bug.cgi?id=655526
- json-glib/json-gobject.c | 13 +++++--------
- json-glib/tests/serialize-complex.c | 19 ++++++++++++++++++-
- json-glib/tests/serialize-full.c | 3 ++-
+ json-glib/json-gobject.c | 13 +++++--------
+ json-glib/tests/serialize-complex.c | 19 ++++++++++++++++++-
+ json-glib/tests/serialize-full.c | 3 ++-
3 files changed, 25 insertions(+), 10 deletions(-)
commit bcfac335a8e4086ff6afa5f267f9886a4d1b6370
values and a parse failure. This patch addresses it by accepting
round gint64 numbers as valid values for float/double properties.
- json-glib/json-gobject.c | 22 +++++++++++++++++++++-
+ json-glib/json-gobject.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
commit 996d89911d71f54f9a476242f1bd43c077d4428c
properties normally needed to be added for the case that
we fail to deserialize construct-only properties.
- json-glib/json-gobject.c | 7 ++++++-
+ json-glib/json-gobject.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 4315308a19e4cf474451cecf8b69aceddda91f49
whether it's appropriate to serialize a property before
JsonGObject checks for a default value and skips the property.
- json-glib/json-gobject.c | 10 ++--------
- json-glib/json-serializable.c | 4 ++++
+ json-glib/json-gobject.c | 10 ++--------
+ json-glib/json-serializable.c | 4 ++++
2 files changed, 6 insertions(+), 8 deletions(-)
commit 4ba9a6a81709221ba58d0f8e067de660eb96914e
pspecs for some fundamental types:
Failed to deserialize property "foo" of type "int" on object "bar"
- json-glib/json-gobject.c | 42 ++++++++++++++++++++++++++++++------------
+ json-glib/json-gobject.c | 42 ++++++++++++++++++++++++++++++------------
1 file changed, 30 insertions(+), 12 deletions(-)
commit 24fa4503ad5d85bf60027bd77c434b2a596b1c17
Fix casting issue in Gvariant creation on some architectures.
- json-glib/json-gvariant.c | 46 +++++++++++++++++++++++++++++++++++++++------
+ json-glib/json-gvariant.c | 46 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 6 deletions(-)
commit dd3c30c5821f9f6bac4cc9016c49c7e6250377eb
Use a structure to keep the testable expressions and their results
together.
- json-glib/tests/path.c | 74 ++++++++++++++++++++++++++++++------------------
+ json-glib/tests/path.c | 74 ++++++++++++++++++++++++++++++++------------------
1 file changed, 47 insertions(+), 27 deletions(-)
commit acb33a7e6bd3d05d36e7278fafdcb4c35ec88388
build: Replace AC_HELP_STRING with AS_HELP_STRING
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit c296ca9ed06b8e4b54a4bd8003593b3a98b94f6b
To compensate for AC_HELP_STRING()'s braindamage.
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1fb457af51a5632956fd679deca0021becb5468b
build: Clean up configure.ac's preamble
- configure.ac | 7 +++++--
+ configure.ac | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 75e370e53cb5d31d4a366fc5f126583872f1349a
Added README.txt's and included them in distribution to tell
people how JSON-GLib can be build on Windows using Visual C++.
- build/win32/vs10/Makefile.am | 1 +
- build/win32/vs10/README.txt | 87 ++++++++++++++++++++++++++++++++++++++++++
- build/win32/vs9/Makefile.am | 1 +
- build/win32/vs9/README.txt | 86 +++++++++++++++++++++++++++++++++++++++++
+ build/win32/vs10/Makefile.am | 1 +
+ build/win32/vs10/README.txt | 87 ++++++++++++++++++++++++++++++++++++++++++++
+ build/win32/vs9/Makefile.am | 1 +
+ build/win32/vs9/README.txt | 86 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 175 insertions(+)
commit 7da6eb52937588537754be7e0b496f51077165d2
This is one of those files that must have CRLF line endings to work
correctly :|
- build/win32/vs10/json-glib.sln | 332 ++++++++++++++++++++--------------------
+ build/win32/vs10/json-glib.sln | 332 ++++++++++++++++++++---------------------
1 file changed, 166 insertions(+), 166 deletions(-)
commit 4ef07b2c6e7d4d444f8ec6ce93c27f7189b942a0
Closes: bgo#653295 - json-glib tests need to link against libgobject-2
- json-glib/tests/Makefile.am | 5 ++++-
+ json-glib/tests/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit c9ac9ce2d417210ccb06d0445a809ce9cd57c7a5
Make up for missed backslash
- build/win32/vs10/json-glib.props | 2 +-
+ build/win32/vs10/json-glib.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 230801c694169e50ca45df7df431adbdb89cab18
Should have realized that my previous commit on Visual C++ 2010 projects
(refinement) can be consolidated into the property sheet...
- build/win32/vs10/array.vcxproj | 8 --------
- build/win32/vs10/boxed.vcxproj | 8 --------
- build/win32/vs10/builder.vcxproj | 8 --------
- build/win32/vs10/generator.vcxproj | 8 --------
- build/win32/vs10/gvariant.vcxproj | 10 +---------
- build/win32/vs10/json-glib.props | 2 +-
- build/win32/vs10/json-glib.vcxprojin | 8 --------
- build/win32/vs10/node.vcxproj | 10 +---------
- build/win32/vs10/object.vcxproj | 10 +---------
- build/win32/vs10/parser.vcxproj | 10 +---------
- build/win32/vs10/path.vcxproj | 10 +---------
- build/win32/vs10/reader.vcxproj | 8 --------
- build/win32/vs10/serialize-complex.vcxproj | 8 --------
- build/win32/vs10/serialize-full.vcxproj | 8 --------
- build/win32/vs10/serialize-simple.vcxproj | 8 --------
+ build/win32/vs10/array.vcxproj | 8 --------
+ build/win32/vs10/boxed.vcxproj | 8 --------
+ build/win32/vs10/builder.vcxproj | 8 --------
+ build/win32/vs10/generator.vcxproj | 8 --------
+ build/win32/vs10/gvariant.vcxproj | 10 +---------
+ build/win32/vs10/json-glib.props | 2 +-
+ build/win32/vs10/json-glib.vcxprojin | 8 --------
+ build/win32/vs10/node.vcxproj | 10 +---------
+ build/win32/vs10/object.vcxproj | 10 +---------
+ build/win32/vs10/parser.vcxproj | 10 +---------
+ build/win32/vs10/path.vcxproj | 10 +---------
+ build/win32/vs10/reader.vcxproj | 8 --------
+ build/win32/vs10/serialize-complex.vcxproj | 8 --------
+ build/win32/vs10/serialize-full.vcxproj | 8 --------
+ build/win32/vs10/serialize-simple.vcxproj | 8 --------
15 files changed, 6 insertions(+), 118 deletions(-)
commit d6fdf92ee000666ceb7892151673b4b56517cdd9
-Fixed dependencies for the "install" project
- build/win32/vs10/array.vcxproj | 8 ++++++--
- build/win32/vs10/boxed.vcxproj | 8 ++++++--
- build/win32/vs10/builder.vcxproj | 8 ++++++--
- build/win32/vs10/generator.vcxproj | 8 ++++++--
- build/win32/vs10/gvariant.vcxproj | 9 ++++++++-
- build/win32/vs10/install.vcxproj | 18 +++++++++---------
- build/win32/vs10/json-glib.vcxprojin | 8 ++++++--
- build/win32/vs10/node.vcxproj | 8 ++++++--
- build/win32/vs10/object.vcxproj | 8 ++++++--
- build/win32/vs10/parser.vcxproj | 8 ++++++--
- build/win32/vs10/path.vcxproj | 9 ++++++++-
- build/win32/vs10/reader.vcxproj | 8 ++++++--
- build/win32/vs10/serialize-complex.vcxproj | 8 ++++++--
- build/win32/vs10/serialize-full.vcxproj | 8 ++++++--
- build/win32/vs10/serialize-simple.vcxproj | 8 ++++++--
+ build/win32/vs10/array.vcxproj | 8 ++++++--
+ build/win32/vs10/boxed.vcxproj | 8 ++++++--
+ build/win32/vs10/builder.vcxproj | 8 ++++++--
+ build/win32/vs10/generator.vcxproj | 8 ++++++--
+ build/win32/vs10/gvariant.vcxproj | 9 ++++++++-
+ build/win32/vs10/install.vcxproj | 18 +++++++++---------
+ build/win32/vs10/json-glib.vcxprojin | 8 ++++++--
+ build/win32/vs10/node.vcxproj | 8 ++++++--
+ build/win32/vs10/object.vcxproj | 8 ++++++--
+ build/win32/vs10/parser.vcxproj | 8 ++++++--
+ build/win32/vs10/path.vcxproj | 9 ++++++++-
+ build/win32/vs10/reader.vcxproj | 8 ++++++--
+ build/win32/vs10/serialize-complex.vcxproj | 8 ++++++--
+ build/win32/vs10/serialize-full.vcxproj | 8 ++++++--
+ build/win32/vs10/serialize-simple.vcxproj | 8 ++++++--
15 files changed, 97 insertions(+), 35 deletions(-)
commit 8518effca75d2249b8186083b950644ba4098d47
Thanks to Emmanuele for updating the VS9 projects earlier due to the
changes in the filenames of the test sources
- build/win32/vs9/array.vcproj | 2 +-
- build/win32/vs9/boxed.vcproj | 2 +-
- build/win32/vs9/builder.vcproj | 2 +-
- build/win32/vs9/generator.vcproj | 2 +-
- build/win32/vs9/gvariant.vcproj | 2 +-
- build/win32/vs9/node.vcproj | 2 +-
- build/win32/vs9/object.vcproj | 2 +-
- build/win32/vs9/parser.vcproj | 2 +-
- build/win32/vs9/path.vcproj | 2 +-
- build/win32/vs9/reader.vcproj | 2 +-
+ build/win32/vs9/array.vcproj | 2 +-
+ build/win32/vs9/boxed.vcproj | 2 +-
+ build/win32/vs9/builder.vcproj | 2 +-
+ build/win32/vs9/generator.vcproj | 2 +-
+ build/win32/vs9/gvariant.vcproj | 2 +-
+ build/win32/vs9/node.vcproj | 2 +-
+ build/win32/vs9/object.vcproj | 2 +-
+ build/win32/vs9/parser.vcproj | 2 +-
+ build/win32/vs9/path.vcproj | 2 +-
+ build/win32/vs9/reader.vcproj | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
commit 49ecbb4e2449ad55623fb46a0072fd1fbaf837e1
stuff accordingly.
-Clean up projects a little bit.
- build/win32/vs10/Makefile.am | 36 ++---
- build/win32/vs10/array-test.vcxproj | 172 ----------------------
- build/win32/vs10/array-test.vcxproj.filters | 14 --
- build/win32/vs10/array.vcxproj | 171 ++++++++++++++++++++++
- build/win32/vs10/array.vcxproj.filters | 14 ++
- build/win32/vs10/boxed.vcxproj | 1 -
- build/win32/vs10/builder-test.vcxproj | 172 ----------------------
- build/win32/vs10/builder-test.vcxproj.filters | 14 --
- build/win32/vs10/builder.vcxproj | 171 ++++++++++++++++++++++
- build/win32/vs10/builder.vcxproj.filters | 14 ++
- build/win32/vs10/generator-test.vcxproj | 172 ----------------------
- build/win32/vs10/generator-test.vcxproj.filters | 14 --
- build/win32/vs10/generator.vcxproj | 171 ++++++++++++++++++++++
- build/win32/vs10/generator.vcxproj.filters | 14 ++
- build/win32/vs10/gvariant-test.vcxproj | 159 ---------------------
- build/win32/vs10/gvariant-test.vcxproj.filters | 14 --
- build/win32/vs10/gvariant.vcxproj | 159 +++++++++++++++++++++
- build/win32/vs10/gvariant.vcxproj.filters | 14 ++
- build/win32/vs10/install.vcxproj | 1 -
- build/win32/vs10/json-glib.props | 1 -
- build/win32/vs10/json-glib.sln | 18 +--
- build/win32/vs10/json-glib.vcxprojin | 1 -
- build/win32/vs10/node-test.vcxproj | 172 ----------------------
- build/win32/vs10/node-test.vcxproj.filters | 14 --
- build/win32/vs10/node.vcxproj | 171 ++++++++++++++++++++++
- build/win32/vs10/node.vcxproj.filters | 14 ++
- build/win32/vs10/object-test.vcxproj | 172 ----------------------
- build/win32/vs10/object-test.vcxproj.filters | 13 --
- build/win32/vs10/object.vcxproj | 171 ++++++++++++++++++++++
- build/win32/vs10/object.vcxproj.filters | 13 ++
- build/win32/vs10/parser-test.vcxproj | 172 ----------------------
- build/win32/vs10/parser-test.vcxproj.filters | 14 --
- build/win32/vs10/parser.vcxproj | 171 ++++++++++++++++++++++
- build/win32/vs10/parser.vcxproj.filters | 14 ++
- build/win32/vs10/path-test.vcxproj | 159 ---------------------
- build/win32/vs10/path-test.vcxproj.filters | 14 --
- build/win32/vs10/path.vcxproj | 159 +++++++++++++++++++++
- build/win32/vs10/path.vcxproj.filters | 14 ++
- build/win32/vs10/reader-test.vcxproj | 173 -----------------------
- build/win32/vs10/reader-test.vcxproj.filters | 14 --
- build/win32/vs10/reader.vcxproj | 172 ++++++++++++++++++++++
- build/win32/vs10/reader.vcxproj.filters | 14 ++
- build/win32/vs10/serialize-complex.vcxproj | 1 -
- build/win32/vs10/serialize-full.vcxproj | 1 -
- build/win32/vs10/serialize-simple.vcxproj | 1 -
+ build/win32/vs10/Makefile.am | 36 ++---
+ build/win32/vs10/array-test.vcxproj | 172 -----------------------
+ build/win32/vs10/array-test.vcxproj.filters | 14 --
+ build/win32/vs10/array.vcxproj | 171 +++++++++++++++++++++++
+ build/win32/vs10/array.vcxproj.filters | 14 ++
+ build/win32/vs10/boxed.vcxproj | 1 -
+ build/win32/vs10/builder-test.vcxproj | 172 -----------------------
+ build/win32/vs10/builder-test.vcxproj.filters | 14 --
+ build/win32/vs10/builder.vcxproj | 171 +++++++++++++++++++++++
+ build/win32/vs10/builder.vcxproj.filters | 14 ++
+ build/win32/vs10/generator-test.vcxproj | 172 -----------------------
+ build/win32/vs10/generator-test.vcxproj.filters | 14 --
+ build/win32/vs10/generator.vcxproj | 171 +++++++++++++++++++++++
+ build/win32/vs10/generator.vcxproj.filters | 14 ++
+ build/win32/vs10/gvariant-test.vcxproj | 159 ----------------------
+ build/win32/vs10/gvariant-test.vcxproj.filters | 14 --
+ build/win32/vs10/gvariant.vcxproj | 159 ++++++++++++++++++++++
+ build/win32/vs10/gvariant.vcxproj.filters | 14 ++
+ build/win32/vs10/install.vcxproj | 1 -
+ build/win32/vs10/json-glib.props | 1 -
+ build/win32/vs10/json-glib.sln | 18 +--
+ build/win32/vs10/json-glib.vcxprojin | 1 -
+ build/win32/vs10/node-test.vcxproj | 172 -----------------------
+ build/win32/vs10/node-test.vcxproj.filters | 14 --
+ build/win32/vs10/node.vcxproj | 171 +++++++++++++++++++++++
+ build/win32/vs10/node.vcxproj.filters | 14 ++
+ build/win32/vs10/object-test.vcxproj | 172 -----------------------
+ build/win32/vs10/object-test.vcxproj.filters | 13 --
+ build/win32/vs10/object.vcxproj | 171 +++++++++++++++++++++++
+ build/win32/vs10/object.vcxproj.filters | 13 ++
+ build/win32/vs10/parser-test.vcxproj | 172 -----------------------
+ build/win32/vs10/parser-test.vcxproj.filters | 14 --
+ build/win32/vs10/parser.vcxproj | 171 +++++++++++++++++++++++
+ build/win32/vs10/parser.vcxproj.filters | 14 ++
+ build/win32/vs10/path-test.vcxproj | 159 ----------------------
+ build/win32/vs10/path-test.vcxproj.filters | 14 --
+ build/win32/vs10/path.vcxproj | 159 ++++++++++++++++++++++
+ build/win32/vs10/path.vcxproj.filters | 14 ++
+ build/win32/vs10/reader-test.vcxproj | 173 ------------------------
+ build/win32/vs10/reader-test.vcxproj.filters | 14 --
+ build/win32/vs10/reader.vcxproj | 172 +++++++++++++++++++++++
+ build/win32/vs10/reader.vcxproj.filters | 14 ++
+ build/win32/vs10/serialize-complex.vcxproj | 1 -
+ build/win32/vs10/serialize-full.vcxproj | 1 -
+ build/win32/vs10/serialize-simple.vcxproj | 1 -
45 files changed, 1668 insertions(+), 1682 deletions(-)
commit 54711b3e093e00457a355926516ba87c8171f17d
build/vs9: Update after the changes in json-glib/tests
- build/win32/vs9/Makefile.am | 24 ++---
- build/win32/vs9/array-test.vcproj | 157 -------------------------------
- build/win32/vs9/array.vcproj | 157 +++++++++++++++++++++++++++++++
- build/win32/vs9/boxed.vcproj | 2 +-
- build/win32/vs9/builder-test.vcproj | 157 -------------------------------
- build/win32/vs9/builder.vcproj | 157 +++++++++++++++++++++++++++++++
- build/win32/vs9/generator-test.vcproj | 157 -------------------------------
- build/win32/vs9/generator.vcproj | 157 +++++++++++++++++++++++++++++++
- build/win32/vs9/gvariant-test.vcproj | 147 -----------------------------
- build/win32/vs9/gvariant.vcproj | 147 +++++++++++++++++++++++++++++
- build/win32/vs9/json-glib.sln | 18 ++--
- build/win32/vs9/node-test.vcproj | 157 -------------------------------
- build/win32/vs9/node.vcproj | 157 +++++++++++++++++++++++++++++++
- build/win32/vs9/object-test.vcproj | 155 ------------------------------
- build/win32/vs9/object.vcproj | 155 ++++++++++++++++++++++++++++++
- build/win32/vs9/parser-test.vcproj | 166 ---------------------------------
- build/win32/vs9/parser.vcproj | 166 +++++++++++++++++++++++++++++++++
- build/win32/vs9/path-test.vcproj | 147 -----------------------------
- build/win32/vs9/path.vcproj | 147 +++++++++++++++++++++++++++++
- build/win32/vs9/reader-test.vcproj | 158 -------------------------------
- build/win32/vs9/reader.vcproj | 158 +++++++++++++++++++++++++++++++
+ build/win32/vs9/Makefile.am | 24 ++---
+ build/win32/vs9/array-test.vcproj | 157 --------------------------------
+ build/win32/vs9/array.vcproj | 157 ++++++++++++++++++++++++++++++++
+ build/win32/vs9/boxed.vcproj | 2 +-
+ build/win32/vs9/builder-test.vcproj | 157 --------------------------------
+ build/win32/vs9/builder.vcproj | 157 ++++++++++++++++++++++++++++++++
+ build/win32/vs9/generator-test.vcproj | 157 --------------------------------
+ build/win32/vs9/generator.vcproj | 157 ++++++++++++++++++++++++++++++++
+ build/win32/vs9/gvariant-test.vcproj | 147 ------------------------------
+ build/win32/vs9/gvariant.vcproj | 147 ++++++++++++++++++++++++++++++
+ build/win32/vs9/json-glib.sln | 18 ++--
+ build/win32/vs9/node-test.vcproj | 157 --------------------------------
+ build/win32/vs9/node.vcproj | 157 ++++++++++++++++++++++++++++++++
+ build/win32/vs9/object-test.vcproj | 155 -------------------------------
+ build/win32/vs9/object.vcproj | 155 +++++++++++++++++++++++++++++++
+ build/win32/vs9/parser-test.vcproj | 166 ----------------------------------
+ build/win32/vs9/parser.vcproj | 166 ++++++++++++++++++++++++++++++++++
+ build/win32/vs9/path-test.vcproj | 147 ------------------------------
+ build/win32/vs9/path.vcproj | 147 ++++++++++++++++++++++++++++++
+ build/win32/vs9/reader-test.vcproj | 158 --------------------------------
+ build/win32/vs9/reader.vcproj | 158 ++++++++++++++++++++++++++++++++
21 files changed, 1423 insertions(+), 1423 deletions(-)
commit 78e896c64e8cbccf1b55291521f11a3f5093080a
It's pointless to add the '-test' suffix to files under the tests/ directory.
- json-glib/tests/Makefile.am | 18 +-
- json-glib/tests/array-test.c | 122 ------
- json-glib/tests/array.c | 122 ++++++
- json-glib/tests/builder-test.c | 161 --------
- json-glib/tests/builder.c | 161 ++++++++
- json-glib/tests/generator-test.c | 330 ----------------
- json-glib/tests/generator.c | 330 ++++++++++++++++
- json-glib/tests/gvariant-test.c | 233 -----------
- json-glib/tests/gvariant.c | 233 +++++++++++
- json-glib/tests/node-test.c | 112 ------
- json-glib/tests/node.c | 112 ++++++
- json-glib/tests/object-test.c | 165 --------
- json-glib/tests/object.c | 165 ++++++++
- json-glib/tests/parser-test.c | 785 --------------------------------------
- json-glib/tests/parser.c | 785 ++++++++++++++++++++++++++++++++++++++
- json-glib/tests/path-test.c | 143 -------
- json-glib/tests/path.c | 143 +++++++
- json-glib/tests/reader-test.c | 134 -------
- json-glib/tests/reader.c | 134 +++++++
+ json-glib/tests/Makefile.am | 18 +-
+ json-glib/tests/array-test.c | 122 ------
+ json-glib/tests/array.c | 122 ++++++
+ json-glib/tests/builder-test.c | 161 --------
+ json-glib/tests/builder.c | 161 ++++++++
+ json-glib/tests/generator-test.c | 330 ----------------
+ json-glib/tests/generator.c | 330 ++++++++++++++++
+ json-glib/tests/gvariant-test.c | 233 ------------
+ json-glib/tests/gvariant.c | 233 ++++++++++++
+ json-glib/tests/node-test.c | 112 ------
+ json-glib/tests/node.c | 112 ++++++
+ json-glib/tests/object-test.c | 165 --------
+ json-glib/tests/object.c | 165 ++++++++
+ json-glib/tests/parser-test.c | 785 ---------------------------------------
+ json-glib/tests/parser.c | 785 +++++++++++++++++++++++++++++++++++++++
+ json-glib/tests/path-test.c | 143 -------
+ json-glib/tests/path.c | 143 +++++++
+ json-glib/tests/reader-test.c | 134 -------
+ json-glib/tests/reader.c | 134 +++++++
19 files changed, 2194 insertions(+), 2194 deletions(-)
commit cef1f16cec529eeb03338f995a8b3d32b262df8b
docs: Add index for symbols added in the 0.13 cycle
- doc/reference/json-glib-docs.xml | 5 +++++
+ doc/reference/json-glib-docs.xml | 5 +++++
1 file changed, 5 insertions(+)
commit cc2543e101ca8fa41989bc8eb296f8d11b5b9cad
The silent-rules option is just added to avoid using AM_SILENT_RULES()
on a separate line.
- configure.ac | 3 +--
+ configure.ac | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit c106aa5b0fc0ca408328b95ba721eef6a9d560d2
Post-release version bump to 0.13.5
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 02b3ee77a35624a3d6e478ae3700100cb24bf18f
Release JSON-GLib 0.13.4
- NEWS | 6 ++++++
- configure.ac | 2 +-
+ NEWS | 6 ++++++
+ configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit f37878ec1759283f78a6d580c1f78e9039717862
docs: Fix API reference missing symbols
- doc/reference/json-glib-sections.txt | 4 ++++
- json-glib/json-gobject.h | 6 ++++++
+ doc/reference/json-glib-sections.txt | 4 ++++
+ json-glib/json-gobject.h | 6 ++++++
2 files changed, 10 insertions(+)
commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6
The macro is going to be deprecated soon.
- json-glib/json-array.c | 2 +-
- json-glib/json-node.c | 6 +++---
- json-glib/json-object.c | 2 +-
- json-glib/json-reader.c | 6 +++---
- json-glib/json-reader.h | 6 +++---
- json-glib/json-types-private.h | 2 +-
- json-glib/json-types.h | 8 ++++----
+ json-glib/json-array.c | 2 +-
+ json-glib/json-node.c | 6 +++---
+ json-glib/json-object.c | 2 +-
+ json-glib/json-reader.c | 6 +++---
+ json-glib/json-reader.h | 6 +++---
+ json-glib/json-types-private.h | 2 +-
+ json-glib/json-types.h | 8 ++++----
7 files changed, 16 insertions(+), 16 deletions(-)
commit 74bb5d61a737cceffd04c8d9ae8d5db390eda5a2
The newly added g_atomic_int_dec_and_test() simplified the logic for
unreffing Object and Array.
- json-glib/json-array.c | 9 ++-------
- json-glib/json-object.c | 9 ++-------
+ json-glib/json-array.c | 9 ++-------
+ json-glib/json-object.c | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
commit 4f83868e3a18adac809aff111c5df5ff7af8fedf
build: Remove deprecation disabling for GLib
- json-glib/Makefile.am | 1 -
+ json-glib/Makefile.am | 1 -
1 file changed, 1 deletion(-)
commit 65a95198a4a1bca7b418af1639c4bb24b09947c5
Added projects to build test program for JSONPath (path-test.c)
- build/win32/vs10/Makefile.am | 2 +
- build/win32/vs10/install.vcxproj | 8 ++
- build/win32/vs10/json-glib.sln | 26 +++--
- build/win32/vs10/path-test.vcxproj | 159 ++++++++++++++++++++++++++++
- build/win32/vs10/path-test.vcxproj.filters | 14 +++
- build/win32/vs9/Makefile.am | 1 +
- build/win32/vs9/json-glib.sln | 30 ++++--
- build/win32/vs9/path-test.vcproj | 147 +++++++++++++++++++++++++
+ build/win32/vs10/Makefile.am | 2 +
+ build/win32/vs10/install.vcxproj | 8 ++
+ build/win32/vs10/json-glib.sln | 26 +++--
+ build/win32/vs10/path-test.vcxproj | 159 +++++++++++++++++++++++++++++
+ build/win32/vs10/path-test.vcxproj.filters | 14 +++
+ build/win32/vs9/Makefile.am | 1 +
+ build/win32/vs9/json-glib.sln | 30 ++++--
+ build/win32/vs9/path-test.vcproj | 147 ++++++++++++++++++++++++++
8 files changed, 371 insertions(+), 16 deletions(-)
commit 16bc9cccd32f4e1c7e9fc0da128aef969d0563b0
Added definition of GETTEXT_PACKAGE due to the addition of the i18n
machinery (commit 67edce08670ce1da4956f87948985434ac5ae2ca)
- build/win32/config.h.win32.in | 3 +++
+ build/win32/config.h.win32.in | 3 +++
1 file changed, 3 insertions(+)
commit d93260c477930140f2ecf2927bd9f2a2d7f4f905
-Add json-path.h to the list of headers to be copied in the "install" stage
- build/win32/vs10/json-glib.props | 2 ++
- build/win32/vs9/json-glib.vsprops | 1 +
+ build/win32/vs10/json-glib.props | 2 ++
+ build/win32/vs9/json-glib.vsprops | 1 +
2 files changed, 3 insertions(+)
commit c3b367ca8bac245712f8390acab1b38a314972a9
serializable: Fix introspection annotations
- json-glib/json-serializable.c | 25 +++++++++++++++++++++++++
+ json-glib/json-serializable.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
commit aee5a7fbb70e5cb714bcfef79a96c000f62e80db
- ChangeLog
empty, and not necessary with the foreign automake option
- AUTHORS | 1 -
- ChangeLog | 6 ------
- MAINTAINERS | 3 ---
- configure.ac | 5 +++--
+ AUTHORS | 1 -
+ ChangeLog | 6 ------
+ MAINTAINERS | 3 ---
+ configure.ac | 5 +++--
4 files changed, 3 insertions(+), 12 deletions(-)
commit 1d4cdb76b6f97c723dd6e4c634bacc52d3199999
Update the ignore file for the po directory
- po/.gitignore | 1 +
+ po/.gitignore | 1 +
1 file changed, 1 insertion(+)
commit 8863766ca4792383dad0e48550f8fb79d4c104e4
These errors might find their way into a UI.
- json-glib/json-gobject.c | 4 ++--
- json-glib/json-gvariant.c | 40 ++++++++++++++++++----------------------
- json-glib/json-parser.c | 5 ++++-
- json-glib/json-path.c | 13 +++++++------
- json-glib/json-reader.c | 20 ++++++++++----------
+ json-glib/json-gobject.c | 4 ++--
+ json-glib/json-gvariant.c | 40 ++++++++++++++++++----------------------
+ json-glib/json-parser.c | 5 ++++-
+ json-glib/json-path.c | 13 +++++++------
+ json-glib/json-reader.c | 20 ++++++++++----------
5 files changed, 41 insertions(+), 41 deletions(-)
commit 67edce08670ce1da4956f87948985434ac5ae2ca
We need to translate the GError messages.
- .gitignore | 2 ++
- Makefile.am | 2 +-
- build/autotools/Makefile.am | 1 +
- build/autotools/as-linguas.m4 | 24 ++++++++++++++++++++++++
- configure.ac | 12 ++++++++++++
- json-glib/json-gobject.c | 2 ++
- json-glib/json-gvariant.c | 6 ++++++
- json-glib/json-parser.c | 2 ++
- json-glib/json-path.c | 4 +++-
- json-glib/json-reader.c | 2 ++
- po/.gitignore | 13 +++++++++++++
- po/Makevars | 7 +++++++
- po/POTFILES.in | 6 ++++++
+ .gitignore | 2 ++
+ Makefile.am | 2 +-
+ build/autotools/Makefile.am | 1 +
+ build/autotools/as-linguas.m4 | 24 ++++++++++++++++++++++++
+ configure.ac | 12 ++++++++++++
+ json-glib/json-gobject.c | 2 ++
+ json-glib/json-gvariant.c | 6 ++++++
+ json-glib/json-parser.c | 2 ++
+ json-glib/json-path.c | 4 +++-
+ json-glib/json-reader.c | 2 ++
+ po/.gitignore | 13 +++++++++++++
+ po/Makevars | 7 +++++++
+ po/POTFILES.in | 6 ++++++
13 files changed, 81 insertions(+), 2 deletions(-)
commit e3b5883d4435da7fe677eb9a7c74d2f83980f5da
If a property is set to its default value then we can skip its
serialization, to keep the number of JSON object members down.
- json-glib/json-gobject.c | 7 +++++++
+ json-glib/json-gobject.c | 7 +++++++
1 file changed, 7 insertions(+)
commit 8c424cc133575282371bff8d17295662267049e9
Do not test the defaults: create the GObject instance with different
values than the default ones from the GParamSpec.
- json-glib/tests/serialize-complex.c | 22 +++++++++++-----------
+ json-glib/tests/serialize-complex.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
commit 96b1e6b50f355c04e794ad7366bd33b9c3d1f81b
This allows a Serializable implementation to override the property list,
and the setter and the getter function.
- json-glib/json-gobject.c | 43 +++++++++++++++++-----
- json-glib/json-gobject.h | 22 +++++++++++
- json-glib/json-serializable.c | 81 +++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-gobject.c | 43 ++++++++++++++++++-----
+ json-glib/json-gobject.h | 22 ++++++++++++
+ json-glib/json-serializable.c | 81 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+), 9 deletions(-)
commit c85fc93f6235b8b9d584585215b2fa860f07f2c3
The validation broke the test suite; it'll need some more work.
- json-glib/json-path.c | 77 ++++++++++++++-----------------------------------
+ json-glib/json-path.c | 77 ++++++++++++++-------------------------------------
1 file changed, 21 insertions(+), 56 deletions(-)
commit e8fa85705e48d03742eb351addbad53be4d8e60b
Especially for the slice syntax.
- json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++--------------
+ json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++++--------------
1 file changed, 56 insertions(+), 21 deletions(-)
commit 295c469329d040b4d311e9c295bec908856190d6
symbols: Add JsonPath public entry points
- json-glib/json-glib.symbols | 6 ++++++
+ json-glib/json-glib.symbols | 6 ++++++
1 file changed, 6 insertions(+)
commit 257209ab47ebcbf36006dd3aa3fcee5545381c6f
docs: Document JsonPath and add it to the API reference
- doc/reference/json-glib-docs.xml | 3 +-
- doc/reference/json-glib-sections.txt | 20 ++++
- doc/reference/json-glib.types | 1 +
- json-glib/json-path.c | 174 +++++++++++++++++++++++++++++++++-
+ doc/reference/json-glib-docs.xml | 3 +-
+ doc/reference/json-glib-sections.txt | 20 ++++
+ doc/reference/json-glib.types | 1 +
+ json-glib/json-path.c | 174 ++++++++++++++++++++++++++++++++++-
4 files changed, 195 insertions(+), 3 deletions(-)
commit ac89bb7fc7491019f8baa687a785eeb93af7213e
For the time being, only positive testing is provided; negative testing
for the expression compilation will follow.
- json-glib/Makefile.am | 2 +
- json-glib/json-debug.c | 3 +-
- json-glib/json-debug.h | 3 +-
- json-glib/json-glib.h | 1 +
- json-glib/json-path.c | 856 +++++++++++++++++++++++++++++++++++++++++++
- json-glib/json-path.h | 97 +++++
- json-glib/tests/Makefile.am | 1 +
- json-glib/tests/path-test.c | 143 ++++++++
+ json-glib/Makefile.am | 2 +
+ json-glib/json-debug.c | 3 +-
+ json-glib/json-debug.h | 3 +-
+ json-glib/json-glib.h | 1 +
+ json-glib/json-path.c | 856 ++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-path.h | 97 +++++
+ json-glib/tests/Makefile.am | 1 +
+ json-glib/tests/path-test.c | 143 ++++++++
8 files changed, 1104 insertions(+), 2 deletions(-)
commit b5bd47727c960990ba98902ee2d7099491a4178a
(yes, the gvariant-test program passes in the 32-bit and 64-bit modes)
-Updated property sheet to "install" the "new" json-gvariant.h
- build/win32/vs10/Makefile.am | 2 +
- build/win32/vs10/gvariant-test.vcxproj | 159 ++++++++++++++++++++++++
- build/win32/vs10/gvariant-test.vcxproj.filters | 14 +++
- build/win32/vs10/json-glib.props | 2 +
- build/win32/vs10/json-glib.sln | 10 ++
- build/win32/vs9/Makefile.am | 1 +
- build/win32/vs9/gvariant-test.vcproj | 147 ++++++++++++++++++++++
- build/win32/vs9/json-glib.sln | 14 +++
- build/win32/vs9/json-glib.vsprops | 1 +
+ build/win32/vs10/Makefile.am | 2 +
+ build/win32/vs10/gvariant-test.vcxproj | 159 +++++++++++++++++++++++++
+ build/win32/vs10/gvariant-test.vcxproj.filters | 14 +++
+ build/win32/vs10/json-glib.props | 2 +
+ build/win32/vs10/json-glib.sln | 10 ++
+ build/win32/vs9/Makefile.am | 1 +
+ build/win32/vs9/gvariant-test.vcproj | 147 +++++++++++++++++++++++
+ build/win32/vs9/json-glib.sln | 14 +++
+ build/win32/vs9/json-glib.vsprops | 1 +
9 files changed, 350 insertions(+)
commit 3a1d817fd39b4b4d2bdbc93257be535c5b29780f
Added the JSON-GLib gvariant-related APIs.
- json-glib/json-glib.symbols | 4 ++++
+ json-glib/json-glib.symbols | 4 ++++
1 file changed, 4 insertions(+)
commit 1b7f20fe88a6647e61964db063eba071114a6f66
This has been checked with "make distcheck" on Fedora 15
- Makefile.am | 2 +-
+ Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 54172e25e8b62075f0aef98d21e17619466ff30f
Update the dist part too...
- build/win32/vs10/Makefile.am | 16 ++++++++--------
- build/win32/vs9/Makefile.am | 8 ++++----
+ build/win32/vs10/Makefile.am | 16 ++++++++--------
+ build/win32/vs9/Makefile.am | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
commit 0715050a5a76f187f66f14288a8f3444a4eb49e4
commit 4e41d26586991d2977c846fa4871b6df39fe4106, update the VS
project files...
- build/win32/vs10/boxed.vcxproj | 172 ++++++++++++++++++++
- build/win32/vs10/boxed.vcxproj.filters | 14 ++
- build/win32/vs10/install.vcxproj | 8 +-
- build/win32/vs10/json-glib.sln | 8 +-
- build/win32/vs10/serialize-complex.vcxproj | 171 +++++++++++++++++++
- build/win32/vs10/serialize-complex.vcxproj.filters | 14 ++
- build/win32/vs10/serialize-full.vcxproj | 172 ++++++++++++++++++++
- build/win32/vs10/serialize-full.vcxproj.filters | 14 ++
- build/win32/vs10/serialize-simple.vcxproj | 171 +++++++++++++++++++
- build/win32/vs10/serialize-simple.vcxproj.filters | 14 ++
- build/win32/vs10/test-serialize-boxed.vcxproj | 172 --------------------
- .../vs10/test-serialize-boxed.vcxproj.filters | 14 --
- build/win32/vs10/test-serialize-complex.vcxproj | 171 -------------------
- .../vs10/test-serialize-complex.vcxproj.filters | 14 --
- build/win32/vs10/test-serialize-full.vcxproj | 172 --------------------
- .../win32/vs10/test-serialize-full.vcxproj.filters | 14 --
- build/win32/vs10/test-serialize-simple.vcxproj | 171 -------------------
- .../vs10/test-serialize-simple.vcxproj.filters | 14 --
- build/win32/vs9/boxed.vcproj | 157 ++++++++++++++++++
- build/win32/vs9/json-glib.sln | 8 +-
- build/win32/vs9/serialize-complex.vcproj | 156 ++++++++++++++++++
- build/win32/vs9/serialize-full.vcproj | 157 ++++++++++++++++++
- build/win32/vs9/serialize-simple.vcproj | 156 ++++++++++++++++++
- build/win32/vs9/test-serialize-boxed.vcproj | 157 ------------------
- build/win32/vs9/test-serialize-complex.vcproj | 156 ------------------
- build/win32/vs9/test-serialize-full.vcproj | 157 ------------------
- build/win32/vs9/test-serialize-simple.vcproj | 156 ------------------
+ build/win32/vs10/boxed.vcxproj | 172 +++++++++++++++++++++
+ build/win32/vs10/boxed.vcxproj.filters | 14 ++
+ build/win32/vs10/install.vcxproj | 8 +-
+ build/win32/vs10/json-glib.sln | 8 +-
+ build/win32/vs10/serialize-complex.vcxproj | 171 ++++++++++++++++++++
+ build/win32/vs10/serialize-complex.vcxproj.filters | 14 ++
+ build/win32/vs10/serialize-full.vcxproj | 172 +++++++++++++++++++++
+ build/win32/vs10/serialize-full.vcxproj.filters | 14 ++
+ build/win32/vs10/serialize-simple.vcxproj | 171 ++++++++++++++++++++
+ build/win32/vs10/serialize-simple.vcxproj.filters | 14 ++
+ build/win32/vs10/test-serialize-boxed.vcxproj | 172 ---------------------
+ .../vs10/test-serialize-boxed.vcxproj.filters | 14 --
+ build/win32/vs10/test-serialize-complex.vcxproj | 171 --------------------
+ .../vs10/test-serialize-complex.vcxproj.filters | 14 --
+ build/win32/vs10/test-serialize-full.vcxproj | 172 ---------------------
+ .../win32/vs10/test-serialize-full.vcxproj.filters | 14 --
+ build/win32/vs10/test-serialize-simple.vcxproj | 171 --------------------
+ .../vs10/test-serialize-simple.vcxproj.filters | 14 --
+ build/win32/vs9/boxed.vcproj | 157 +++++++++++++++++++
+ build/win32/vs9/json-glib.sln | 8 +-
+ build/win32/vs9/serialize-complex.vcproj | 156 +++++++++++++++++++
+ build/win32/vs9/serialize-full.vcproj | 157 +++++++++++++++++++
+ build/win32/vs9/serialize-simple.vcproj | 156 +++++++++++++++++++
+ build/win32/vs9/test-serialize-boxed.vcproj | 157 -------------------
+ build/win32/vs9/test-serialize-complex.vcproj | 156 -------------------
+ build/win32/vs9/test-serialize-full.vcproj | 157 -------------------
+ build/win32/vs9/test-serialize-simple.vcproj | 156 -------------------
27 files changed, 1380 insertions(+), 1380 deletions(-)
commit 8b778252358ddb28936c6c9192a84f76368ca122
Clean up some odd code, and add a unit for the empty object case outlined
in bug 651271.
- json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++-----
+ json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 46 insertions(+), 6 deletions(-)
commit d784cc6825607c517d7565049108d1f908a1d71b
https://bugzilla.gnome.org/show_bug.cgi?id=651271
- json-glib/json-builder.c | 1 +
+ json-glib/json-builder.c | 1 +
1 file changed, 1 insertion(+)
commit e20a8b0faeb45d1ae2f1bd12d49d31d12e357b24
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
- json-glib/json-gvariant.c | 4 ++--
+ json-glib/json-gvariant.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 4e41d26586991d2977c846fa4871b6df39fe4106
The test framework should live under the json-glib directory, and not be
spread across the project.
- Makefile.am | 6 -
- configure.ac | 2 -
- json-glib/tests/Makefile.am | 53 ++---
- json-glib/tests/boxed.c | 264 +++++++++++++++++++++++
- json-glib/tests/serialize-complex.c | 293 +++++++++++++++++++++++++
- json-glib/tests/serialize-full.c | 402 +++++++++++++++++++++++++++++++++++
- json-glib/tests/serialize-simple.c | 166 +++++++++++++++
- tests/Makefile.am | 34 ---
- tests/test-serialize-boxed.c | 264 -----------------------
- tests/test-serialize-complex.c | 293 -------------------------
- tests/test-serialize-full.c | 402 -----------------------------------
- tests/test-serialize-simple.c | 166 ---------------
+ Makefile.am | 6 -
+ configure.ac | 2 -
+ json-glib/tests/Makefile.am | 53 ++---
+ json-glib/tests/boxed.c | 264 +++++++++++++++++++++++
+ json-glib/tests/serialize-complex.c | 293 ++++++++++++++++++++++++++
+ json-glib/tests/serialize-full.c | 402 ++++++++++++++++++++++++++++++++++++
+ json-glib/tests/serialize-simple.c | 166 +++++++++++++++
+ tests/Makefile.am | 34 ---
+ tests/test-serialize-boxed.c | 264 -----------------------
+ tests/test-serialize-complex.c | 293 --------------------------
+ tests/test-serialize-full.c | 402 ------------------------------------
+ tests/test-serialize-simple.c | 166 ---------------
12 files changed, 1142 insertions(+), 1203 deletions(-)
commit 8d98b99b945423085232d358492e97399c9fd071
-Make DLL/LIB versioning more like the autotools-compiled versions
-"Install" the headers in a more consistent way like the autotools versions
- build/win32/vs10/json-glib.props | 26 +++++++++++++-------------
- build/win32/vs9/json-glib.vsprops | 32 ++++++++++++++++----------------
+ build/win32/vs10/json-glib.props | 26 +++++++++++++-------------
+ build/win32/vs9/json-glib.vsprops | 32 ++++++++++++++++----------------
2 files changed, 29 insertions(+), 29 deletions(-)
commit 15221448b5998a071b72299c666044dd65ea97e3
Add ignore file under build/win32
- build/win32/.gitignore | 4 ++++
+ build/win32/.gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit f4651885961bf3ccc8d475cdc86af051fe1101f6
doap: Add the download-page resource
- json-glib.doap | 2 ++
+ json-glib.doap | 2 ++
1 file changed, 2 insertions(+)
commit 8ef7da62a7575ebb04c69b9d98fd24efb840ab3b
Post-release version bump to 0.13.3
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit aa793a4fbcc4d44d367ba84d3782823885fec045
Release JSON-GLib 0.13.2 (snapshot)
- NEWS | 12 ++++++++++++
- configure.ac | 2 +-
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
commit 595bdd9cc160f10edefb9e54f45cb4727f39ac24
This fixes deserialization to match serialization (bug 648539)
- json-glib/json-gobject.c | 14 +++++++++++++-
+ json-glib/json-gobject.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
commit 9824a32a803bd194208d460068ce5ba91d776686
Warn from json_gobject_deserialize() if a listed property cannot be deserialized.
- json-glib/json-gobject.c | 3 +++
+ json-glib/json-gobject.c | 3 +++
1 file changed, 3 insertions(+)
commit 254e8e969968e7ed5f594238a980b20c6fabc46e
reader: Fix bug in example usage
- json-glib/json-reader.c | 2 +-
+ json-glib/json-reader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 46a8e576f2fae9563219fcd72a9866826e684559
DLL has its source files input into it by the preprocessor during
"make dist", like the VS2008 project files, simplifying its maintenance.
- build/win32/vs10/array-test.vcxproj | 172 +++++++++++++++++
- build/win32/vs10/array-test.vcxproj.filters | 14 ++
- build/win32/vs10/builder-test.vcxproj | 172 +++++++++++++++++
- build/win32/vs10/builder-test.vcxproj.filters | 14 ++
- build/win32/vs10/generator-test.vcxproj | 172 +++++++++++++++++
- build/win32/vs10/generator-test.vcxproj.filters | 14 ++
- build/win32/vs10/install.vcxproj | 149 +++++++++++++++
- build/win32/vs10/json-glib.props | 123 ++++++++++++
- build/win32/vs10/json-glib.sln | 146 +++++++++++++++
- build/win32/vs10/json-glib.vcxproj.filtersin | 20 ++
- build/win32/vs10/json-glib.vcxprojin | 196 ++++++++++++++++++++
- build/win32/vs10/node-test.vcxproj | 172 +++++++++++++++++
- build/win32/vs10/node-test.vcxproj.filters | 14 ++
- build/win32/vs10/object-test.vcxproj | 172 +++++++++++++++++
- build/win32/vs10/object-test.vcxproj.filters | 13 ++
- build/win32/vs10/parser-test.vcxproj | 172 +++++++++++++++++
- build/win32/vs10/parser-test.vcxproj.filters | 14 ++
- build/win32/vs10/reader-test.vcxproj | 173 +++++++++++++++++
- build/win32/vs10/reader-test.vcxproj.filters | 14 ++
- build/win32/vs10/test-serialize-boxed.vcxproj | 172 +++++++++++++++++
- .../vs10/test-serialize-boxed.vcxproj.filters | 14 ++
- build/win32/vs10/test-serialize-complex.vcxproj | 171 +++++++++++++++++
- .../vs10/test-serialize-complex.vcxproj.filters | 14 ++
- build/win32/vs10/test-serialize-full.vcxproj | 172 +++++++++++++++++
- .../win32/vs10/test-serialize-full.vcxproj.filters | 14 ++
- build/win32/vs10/test-serialize-simple.vcxproj | 171 +++++++++++++++++
- .../vs10/test-serialize-simple.vcxproj.filters | 14 ++
+ build/win32/vs10/array-test.vcxproj | 172 ++++++++++++++++++
+ build/win32/vs10/array-test.vcxproj.filters | 14 ++
+ build/win32/vs10/builder-test.vcxproj | 172 ++++++++++++++++++
+ build/win32/vs10/builder-test.vcxproj.filters | 14 ++
+ build/win32/vs10/generator-test.vcxproj | 172 ++++++++++++++++++
+ build/win32/vs10/generator-test.vcxproj.filters | 14 ++
+ build/win32/vs10/install.vcxproj | 149 ++++++++++++++++
+ build/win32/vs10/json-glib.props | 123 +++++++++++++
+ build/win32/vs10/json-glib.sln | 146 +++++++++++++++
+ build/win32/vs10/json-glib.vcxproj.filtersin | 20 +++
+ build/win32/vs10/json-glib.vcxprojin | 196 +++++++++++++++++++++
+ build/win32/vs10/node-test.vcxproj | 172 ++++++++++++++++++
+ build/win32/vs10/node-test.vcxproj.filters | 14 ++
+ build/win32/vs10/object-test.vcxproj | 172 ++++++++++++++++++
+ build/win32/vs10/object-test.vcxproj.filters | 13 ++
+ build/win32/vs10/parser-test.vcxproj | 172 ++++++++++++++++++
+ build/win32/vs10/parser-test.vcxproj.filters | 14 ++
+ build/win32/vs10/reader-test.vcxproj | 173 ++++++++++++++++++
+ build/win32/vs10/reader-test.vcxproj.filters | 14 ++
+ build/win32/vs10/test-serialize-boxed.vcxproj | 172 ++++++++++++++++++
+ .../vs10/test-serialize-boxed.vcxproj.filters | 14 ++
+ build/win32/vs10/test-serialize-complex.vcxproj | 171 ++++++++++++++++++
+ .../vs10/test-serialize-complex.vcxproj.filters | 14 ++
+ build/win32/vs10/test-serialize-full.vcxproj | 172 ++++++++++++++++++
+ .../win32/vs10/test-serialize-full.vcxproj.filters | 14 ++
+ build/win32/vs10/test-serialize-simple.vcxproj | 171 ++++++++++++++++++
+ .../vs10/test-serialize-simple.vcxproj.filters | 14 ++
27 files changed, 2678 insertions(+)
commit 6c74292e66be25840612d7ee6871f1668010eada
Also eliminate json-version.h.win32 as it is no longer needed (distribute
json-version.h during "make dist")
- build/win32/config.h.win32 | 61 -----------------------
- build/win32/config.h.win32.in | 61 +++++++++++++++++++++++
- build/win32/json-version.h.win32 | 100 --------------------------------------
+ build/win32/config.h.win32 | 61 ------------------------
+ build/win32/config.h.win32.in | 61 ++++++++++++++++++++++++
+ build/win32/json-version.h.win32 | 100 ---------------------------------------
3 files changed, 61 insertions(+), 161 deletions(-)
commit a7bdf87ec150ac7a88a850190fa79359197e552e
and support for VS2010 is also added here, with similar automation support,
too.
- Makefile.am | 2 +-
- build/win32/Makefile.am | 4 ++--
- build/win32/vs10/Makefile.am | 33 +++++++++++++++++++++++++++++++++
- build/win32/vs9/Makefile.am | 1 +
- configure.ac | 2 ++
- json-glib/Makefile.am | 39 ++++++++++++++++++++++++++++++++++++++-
+ Makefile.am | 2 +-
+ build/win32/Makefile.am | 4 ++--
+ build/win32/vs10/Makefile.am | 33 +++++++++++++++++++++++++++++++++
+ build/win32/vs9/Makefile.am | 1 +
+ configure.ac | 2 ++
+ json-glib/Makefile.am | 39 ++++++++++++++++++++++++++++++++++++++-
6 files changed, 77 insertions(+), 4 deletions(-)
commit 20fe28cfaa605e11c47fe53232b5dccfa47ddf8b
These are the updated VS 2008 Project files and property sheets
themselves. x64 compiling support is also added
- build/win32/vs9/array-test.vcproj | 132 ++++------
- build/win32/vs9/builder-test.vcproj | 134 ++++-------
- build/win32/vs9/generator-test.vcproj | 134 ++++-------
- build/win32/vs9/install.vcproj | 44 ++--
- build/win32/vs9/json-glib.sln | 115 ++++++++-
- build/win32/vs9/json-glib.vcproj | 317 -------------------------
- build/win32/vs9/json-glib.vcprojin | 204 ++++++++++++++++
- build/win32/vs9/json-glib.vsprops | 20 +-
- build/win32/vs9/node-test.vcproj | 134 ++++-------
- build/win32/vs9/object-test.vcproj | 134 ++++-------
- build/win32/vs9/parser-test.vcproj | 125 ++++------
- build/win32/vs9/reader-test.vcproj | 134 ++++-------
- build/win32/vs9/test-serialize-boxed.vcproj | 134 ++++-------
- build/win32/vs9/test-serialize-complex.vcproj | 134 ++++-------
- build/win32/vs9/test-serialize-full.vcproj | 134 ++++-------
- build/win32/vs9/test-serialize-simple.vcproj | 133 ++++-------
+ build/win32/vs9/array-test.vcproj | 132 ++++-------
+ build/win32/vs9/builder-test.vcproj | 134 +++++------
+ build/win32/vs9/generator-test.vcproj | 134 +++++------
+ build/win32/vs9/install.vcproj | 44 ++--
+ build/win32/vs9/json-glib.sln | 115 +++++++++-
+ build/win32/vs9/json-glib.vcproj | 317 --------------------------
+ build/win32/vs9/json-glib.vcprojin | 204 +++++++++++++++++
+ build/win32/vs9/json-glib.vsprops | 20 +-
+ build/win32/vs9/node-test.vcproj | 134 +++++------
+ build/win32/vs9/object-test.vcproj | 134 +++++------
+ build/win32/vs9/parser-test.vcproj | 125 +++++-----
+ build/win32/vs9/reader-test.vcproj | 134 +++++------
+ build/win32/vs9/test-serialize-boxed.vcproj | 134 +++++------
+ build/win32/vs9/test-serialize-complex.vcproj | 134 +++++------
+ build/win32/vs9/test-serialize-full.vcproj | 134 +++++------
+ build/win32/vs9/test-serialize-simple.vcproj | 133 ++++-------
16 files changed, 917 insertions(+), 1245 deletions(-)
commit 61da54311018f7afedb5d1e8cbd88ae7a284714f
JSON-GLib uses the GNOME Bugzilla instance.
- json-glib.doap | 19 +------------------
+ json-glib.doap | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
commit 0ff8f784848ad34c37bd60ad92791c6f76944803
Building against JSON-GLib requires GIO.
- json-glib.pc.in | 2 +-
+ json-glib.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8b060cd9144990aae6531982bad66050fafcb658
Instead of manual iteration, let's use the function GList provides us.
- json-glib/json-object.c | 13 +++----------
+ json-glib/json-object.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
commit 2158cecee6fe1da8786afe2fad94d1098f879786
compilation on/for win32, we should also be using the canonicalization
facilities from autoconf.
- configure.ac | 20 +++++++++++---------
+ configure.ac | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
commit 992d966572e3e498031578558ac307d0f4909246
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- json-glib/json-gvariant.c | 2 +-
+ json-glib/json-gvariant.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit af70f34b3fc46a4c464418ebd6a16d9a1f18af8a
https://bugzilla.gnome.org/show_bug.cgi?id=640729
- json-glib/json-generator.c | 35 +++++++++++------
- json-glib/tests/builder-test.c | 6 +--
- json-glib/tests/generator-test.c | 34 ++++++++---------
- json-glib/tests/gvariant-test.c | 78 +++++++++++++++++++-------------------
+ json-glib/json-generator.c | 35 +++++++++++-------
+ json-glib/tests/builder-test.c | 6 ++--
+ json-glib/tests/generator-test.c | 34 +++++++++---------
+ json-glib/tests/gvariant-test.c | 78 ++++++++++++++++++++--------------------
4 files changed, 82 insertions(+), 71 deletions(-)
commit 8bb22d7de00f15ef44cad502d757639d8a4e8973
Fix introspection annotations
- json-glib/json-node.c | 7 ++++---
- json-glib/json-object.c | 4 ++--
+ json-glib/json-node.c | 7 ++++---
+ json-glib/json-object.c | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
commit 217127545b07f93ac27e3f137d748d61a5e199da
Verify that setting an object member multiple times does not lead to
random values.
- json-glib/tests/object-test.c | 29 +++++++++++++++++++++++++++++
+ json-glib/tests/object-test.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
commit 1a633159a593c962233a5ef4660e31e60eed96d9
https://bugzilla.gnome.org/show_bug.cgi?id=642383
- json-glib/json-object.c | 21 +++++++++++++++++++++
+ json-glib/json-object.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
commit a125a724894a08a8d8053fdd2db92d0ad8e2dfd4
let's do it inside the finalize implementation instead of the dispose
one.
- json-glib/json-reader.c | 15 ++++++---------
+ json-glib/json-reader.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
commit 2c5f4563c54fa273ffd8dbe02b60a12c4b54b977
This should allow easy access to the member name during iteration.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-glib.symbols | 1 +
- json-glib/json-reader.c | 32 ++++++++++++++++++++++++++++++++
- json-glib/json-reader.h | 1 +
- json-glib/tests/reader-test.c | 1 +
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-glib.symbols | 1 +
+ json-glib/json-reader.c | 32 ++++++++++++++++++++++++++++++++
+ json-glib/json-reader.h | 1 +
+ json-glib/tests/reader-test.c | 1 +
5 files changed, 36 insertions(+)
commit b2880f5a4dad07ff96a9b6578ffc5d677f75eb94
offset might be an easy (albeit slightly less performant) way to access
data.
- json-glib/json-reader.c | 67 +++++++++++++++++++++++++++++++----------
- json-glib/tests/reader-test.c | 6 ++++
+ json-glib/json-reader.c | 67 ++++++++++++++++++++++++++++++++-----------
+ json-glib/tests/reader-test.c | 6 ++++
2 files changed, 57 insertions(+), 16 deletions(-)
commit 74ed11db6da9839ce17b448d6d17103ea0734dda
Allow retrieving a list of member names from the current cursor position
of the JsonReader. It's useful if you're trying to inspect a JSON tree.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-glib.symbols | 1 +
- json-glib/json-reader.c | 46 ++++++++++++++++++++++++++++++++++
- json-glib/json-reader.h | 1 +
- json-glib/tests/reader-test.c | 19 ++++++++++++++
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-glib.symbols | 1 +
+ json-glib/json-reader.c | 46 ++++++++++++++++++++++++++++++++++++
+ json-glib/json-reader.h | 1 +
+ json-glib/tests/reader-test.c | 19 +++++++++++++++
5 files changed, 68 insertions(+)
commit eb14f92019bde75947a98f5578167af6b6a17974
Plus: coding style in JSON-GLib is mostly the same as GTK+ and Clutter,
so we should adhere to it.
- json-glib/json-gvariant.c | 67 ++++++++++++++++++++++++---------------------
+ json-glib/json-gvariant.c | 67 +++++++++++++++++++++++++----------------------
1 file changed, 36 insertions(+), 31 deletions(-)
commit 212b243c07721242da3dc2c0e6dfe979f73ee5c6
installation script on gnome.org will create a gzipped tarball by itself
anyway.
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7c07a6549df1ae1b4826bf40f70c62768ce7e35b
build: Fix previous commit
- configure.ac | 7 +++++++
+ configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
commit bb67e146c9e883185d264e693cc4a07d1a60d191
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- build/Makefile.am | 2 +-
- build/win32/Makefile.am | 3 +
- build/win32/config.h.win32 | 61 +++++
- build/win32/json-version.h.win32 | 100 ++++++++
- build/win32/vs9/Makefile.am | 19 ++
- build/win32/vs9/array-test.vcproj | 189 +++++++++++++++
- build/win32/vs9/builder-test.vcproj | 189 +++++++++++++++
- build/win32/vs9/generator-test.vcproj | 189 +++++++++++++++
- build/win32/vs9/install.vcproj | 71 ++++++
- build/win32/vs9/json-glib.sln | 80 +++++++
- build/win32/vs9/json-glib.vcproj | 317 +++++++++++++++++++++++++
- build/win32/vs9/json-glib.vsprops | 93 ++++++++
- build/win32/vs9/node-test.vcproj | 189 +++++++++++++++
- build/win32/vs9/object-test.vcproj | 187 +++++++++++++++
- build/win32/vs9/parser-test.vcproj | 189 +++++++++++++++
- build/win32/vs9/reader-test.vcproj | 190 +++++++++++++++
- build/win32/vs9/test-serialize-boxed.vcproj | 189 +++++++++++++++
- build/win32/vs9/test-serialize-complex.vcproj | 188 +++++++++++++++
- build/win32/vs9/test-serialize-full.vcproj | 189 +++++++++++++++
- build/win32/vs9/test-serialize-simple.vcproj | 189 +++++++++++++++
+ build/Makefile.am | 2 +-
+ build/win32/Makefile.am | 3 +
+ build/win32/config.h.win32 | 61 +++++
+ build/win32/json-version.h.win32 | 100 ++++++++
+ build/win32/vs9/Makefile.am | 19 ++
+ build/win32/vs9/array-test.vcproj | 189 +++++++++++++++
+ build/win32/vs9/builder-test.vcproj | 189 +++++++++++++++
+ build/win32/vs9/generator-test.vcproj | 189 +++++++++++++++
+ build/win32/vs9/install.vcproj | 71 ++++++
+ build/win32/vs9/json-glib.sln | 80 +++++++
+ build/win32/vs9/json-glib.vcproj | 317 ++++++++++++++++++++++++++
+ build/win32/vs9/json-glib.vsprops | 93 ++++++++
+ build/win32/vs9/node-test.vcproj | 189 +++++++++++++++
+ build/win32/vs9/object-test.vcproj | 187 +++++++++++++++
+ build/win32/vs9/parser-test.vcproj | 189 +++++++++++++++
+ build/win32/vs9/reader-test.vcproj | 190 +++++++++++++++
+ build/win32/vs9/test-serialize-boxed.vcproj | 189 +++++++++++++++
+ build/win32/vs9/test-serialize-complex.vcproj | 188 +++++++++++++++
+ build/win32/vs9/test-serialize-full.vcproj | 189 +++++++++++++++
+ build/win32/vs9/test-serialize-simple.vcproj | 189 +++++++++++++++
20 files changed, 2822 insertions(+), 1 deletion(-)
commit c7cd46b8320157e223009aa2a7204461c7d301d5
build: Add .symbols file for win32 builds
- json-glib/Makefile.am | 2 +
- json-glib/json-glib.symbols | 163 +++++++++++++++++++++++++++++++++++++++++++
+ json-glib/Makefile.am | 2 +
+ json-glib/json-glib.symbols | 163 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 165 insertions(+)
commit 4549af3210461a07dc84a30433a0a23764618e4c
Bug #635398
- json-glib/Makefile.am | 2 +-
+ json-glib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f89a50e24d2088061eb7d975db7e6f39beaf853d
Check if we're setting the same node, to avoid a needless replace.
- json-glib/json-object.c | 10 ++++++++++
+ json-glib/json-object.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit e828cba563f2584e848994935478a7ffd21728df
https://bugzilla.gnome.org/show_bug.cgi?id=638932
- json-glib/json-array.c | 8 ++++----
- json-glib/json-node.c | 8 ++++----
- json-glib/json-object.c | 8 ++++----
- json-glib/json-parser.c | 2 +-
- json-glib/json-serializable.c | 2 +-
+ json-glib/json-array.c | 8 ++++----
+ json-glib/json-node.c | 8 ++++----
+ json-glib/json-object.c | 8 ++++----
+ json-glib/json-parser.c | 2 +-
+ json-glib/json-serializable.c | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
commit 02dd77efaa60201f74349c969dc005c8bb092057
https://bugzilla.gnome.org/show_bug.cgi?id=637244
- json-glib/json-generator.c | 7 ++++---
+ json-glib/json-generator.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 3dbab961e675d0684df1121906ae3588d09653e6
Serialization of floating point values might lead to odd formats,
especially when dealing with IEEE machine-neutral values.
- json-glib/tests/builder-test.c | 4 ++--
+ json-glib/tests/builder-test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 567d7fb4dff83c9e37e64ef8611f0231fa181c34
Use modern API to deal with properties installation and notification.
- json-glib/json-reader.c | 35 +++++++++++++++--------------------
+ json-glib/json-reader.c | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
commit 9aed6f5a455109186ae56ec1c3e558505644d57f
While we're at it, we should also use modern API for installing and
notifying of property changes.
- doc/reference/json-glib-sections.txt | 11 +-
- json-glib/json-generator.c | 256 ++++++++++++++++++++++++++++------
- json-glib/json-generator.h | 37 +++--
+ doc/reference/json-glib-sections.txt | 11 +-
+ json-glib/json-generator.c | 256 +++++++++++++++++++++++++++++------
+ json-glib/json-generator.h | 37 +++--
3 files changed, 247 insertions(+), 57 deletions(-)
commit de991a0c6dc4d0b3c366248e20ba6853bd2c3e92
function explicitely for this reason, but it's always good to have a
comprehensive test suite.
- json-glib/tests/generator-test.c | 58 ++++++++++++++++++++++++++++++++++++++
+ json-glib/tests/generator-test.c | 58 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
commit 4add0e081b8f58dec1cd68152d846be87942091e
JsonGenerator is not able to generate strings for bare values, something
that completely went under the radar for all this time.
- json-glib/json-generator.c | 15 ++++++++++-----
+ json-glib/json-generator.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
commit 20a16d5b9ecabe68ee18655b2ff3bdb17136c6f1
Upstream GLib fixed the test rules to avoid repeating the test suite
three times.
- build/autotools/Makefile.am.gtest | 21 ++++++++++++---------
+ build/autotools/Makefile.am.gtest | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
commit dc262a09572328342164ebb23ad698b5cb3cd8ff
Use G_DEFINE_INTERFACE()
- json-glib/json-serializable.c | 35 +++++++----------------------------
+ json-glib/json-serializable.c | 35 +++++++----------------------------
1 file changed, 7 insertions(+), 28 deletions(-)
commit 80665415cd945f3dafed6925c9975f36b916a80f
Use G_DEFINE_BOXED_TYPE()
- json-glib/json-array.c | 13 +------------
- json-glib/json-node.c | 13 +------------
- json-glib/json-object.c | 13 +------------
+ json-glib/json-array.c | 13 +------------
+ json-glib/json-node.c | 13 +------------
+ json-glib/json-object.c | 13 +------------
3 files changed, 3 insertions(+), 36 deletions(-)
commit 51e2eef48fabbee554193ee9eadfb8696ebb3ac7
build: Depend on GLib ≥ 2.26
- README | 2 +-
- configure.ac | 2 +-
+ README | 2 +-
+ configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit d28db01f5d12497ec96d5e507af4003b076dd154
build: Use -no-undefined when compiling on win32
- configure.ac | 13 +++++++++++++
+ configure.ac | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit 5332217481b3e5fee73710bb50886fbc52a632a4
Post-branch version bump to 0.13.1
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 6b4d49b8024f672d62a7059c083455ad31f7d0eb
Post-release version bump to 0.12.1
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 661a7497cc88aebdee32bf31c219d457ca143590
Release JSON-GLib 0.12.0
- NEWS | 1 +
- README | 6 +++---
- configure.ac | 4 ++--
+ NEWS | 1 +
+ README | 6 +++---
+ configure.ac | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
commit 9b6acd68e156a45cc845bdebd99c174e82d0677c
flagged as G_PARAM_CONSTRUCT gets passed with the rest of the properties
after that.
- json-glib/json-gobject.c | 4 ++--
+ json-glib/json-gobject.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit d480f2e77e3dc0d00fc617686b306f96353b7177
If you don't override JsonSerializable, you get the default behaviour
anyway.
- tests/test-serialize-full.c | 15 +--------------
+ tests/test-serialize-full.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
commit ff5dd56e4f864d0c015dcd66fa852f9cf7cf90dd
debug: Add debug notes in the GObject code
- json-glib/json-gobject.c | 14 ++++++++++++--
- json-glib/json-serializable.c | 3 +++
+ json-glib/json-gobject.c | 14 ++++++++++++--
+ json-glib/json-serializable.c | 3 +++
2 files changed, 15 insertions(+), 2 deletions(-)
commit 7707b18f42b3a19dd780ba73ce1dabb6b8ef3c95
debug: Add debug flags for GObject-related code
- json-glib/json-debug.c | 3 ++-
- json-glib/json-debug.h | 3 ++-
+ json-glib/json-debug.c | 3 ++-
+ json-glib/json-debug.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
commit c6bf7ecb0a836b5b43f203cb22be577bd54b9e9a
Also, undefine JSON_DISABLE_DEPRECATED, to introspect deprecated API.
- configure.ac | 2 +-
- json-glib/Makefile.am | 4 ++--
+ configure.ac | 2 +-
+ json-glib/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 617286e4d38a93e41e1e1d974d01c1d73fd2ff66
Add introspection annotations
- json-glib/json-array.c | 4 ++--
- json-glib/json-gboxed.c | 14 +++++++-------
- json-glib/json-gobject.c | 4 ++--
- json-glib/json-object.c | 4 ++--
+ json-glib/json-array.c | 4 ++--
+ json-glib/json-gboxed.c | 14 +++++++-------
+ json-glib/json-gobject.c | 4 ++--
+ json-glib/json-object.c | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
commit 19b0b873c07f918e06a8610f27a439334334a83d
introspection: Export json-glib-1.0 pkg-config file
- json-glib/Makefile.am | 2 +-
+ json-glib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d05e919208a47c18d001ac08900b4d2837efd4b4
docs: Add transfer none annotation to JsonBuilder return values.
- json-glib/json-builder.c | 22 +++++++++++-----------
+ json-glib/json-builder.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
commit 2c3062cbd79826b184a6f613c519e69f3ddc1ec6
builder: Add Since: annotations
- json-glib/json-builder.h | 54 +++++++++++++++++++++++++---------------------
+ json-glib/json-builder.h | 54 +++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 24 deletions(-)
commit 2d7550948dfb2e5907b851bc2c4bd296a7526086
G_PARAM_CONSTRUCT_ONLY properties when creating a new instance from a
JSON definition.
- json-glib/json-gobject.c | 2 +-
+ json-glib/json-gobject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit be48afe5801a541996bb64437c278088e70258f6
build: Use maintainer-clean for removing ignore files
- build/autotools/Makefile.am.gitignore | 11 ++++++++---
+ build/autotools/Makefile.am.gitignore | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
commit 5732cadfab58435ded4e88b0733c1a46aa0dcd2d
Use noinst_PROGRAMS to generate the list of test binaries to ignore
directly in the test directories.
- .gitignore | 11 -----------
- build/autotools/Makefile.am | 3 ++-
- build/autotools/Makefile.am.gitignore | 19 +++++++++++++++++++
- json-glib/tests/Makefile.am | 4 ++++
- tests/Makefile.am | 4 ++++
+ .gitignore | 11 -----------
+ build/autotools/Makefile.am | 3 ++-
+ build/autotools/Makefile.am.gitignore | 19 +++++++++++++++++++
+ json-glib/tests/Makefile.am | 4 ++++
+ tests/Makefile.am | 4 ++++
5 files changed, 29 insertions(+), 12 deletions(-)
commit 8b54bed521b609c373a48d27c880cc70272b6313
docs: Add 0.12 symbols index to the API reference
- doc/reference/json-glib-docs.xml | 5 +++++
+ doc/reference/json-glib-docs.xml | 5 +++++
1 file changed, 5 insertions(+)
commit 9ed8d5e7fe96b9dcf82ddbba7de2db40d415cbaf
A JsonReader is useless without a root JsonNode to start walking the
tree from.
- json-glib/json-reader.c | 96 +++++++++++++++++++++++++++++++++++++----
- json-glib/json-reader.h | 2 +-
- json-glib/tests/reader-test.c | 4 +-
+ json-glib/json-reader.c | 96 +++++++++++++++++++++++++++++++++++++++----
+ json-glib/json-reader.h | 2 +-
+ json-glib/tests/reader-test.c | 4 +-
3 files changed, 91 insertions(+), 11 deletions(-)
commit eeeae2194223abe2515e18edec1bdbbb6a7c793d
tree - in the same way that JsonBuilder does not generate the
stringified version of the JSON tree it builds.
- doc/reference/json-glib-sections.txt | 2 +-
- json-glib/json-reader.c | 90 +++++++++++-----------------------
- json-glib/json-reader.h | 6 +--
- json-glib/tests/reader-test.c | 11 ++++-
+ doc/reference/json-glib-sections.txt | 2 +-
+ json-glib/json-reader.c | 90 ++++++++++++------------------------
+ json-glib/json-reader.h | 6 +--
+ json-glib/tests/reader-test.c | 11 ++++-
4 files changed, 41 insertions(+), 68 deletions(-)
commit 149d2f3925ca798886f2137ae73488f7e2e6386b
We should strive to make JsonBuilder and JsonReader similar in API.
- doc/reference/json-glib-sections.txt | 10 +++++-----
- json-glib/json-reader.c | 34 +++++++++++++++++-----------------
- json-glib/json-reader.h | 10 +++++-----
- json-glib/tests/reader-test.c | 8 ++++----
+ doc/reference/json-glib-sections.txt | 10 +++++-----
+ json-glib/json-reader.c | 34 +++++++++++++++++-----------------
+ json-glib/json-reader.h | 10 +++++-----
+ json-glib/tests/reader-test.c | 8 ++++----
4 files changed, 31 insertions(+), 31 deletions(-)
commit b385ca3ae47e68cdf48f3641385b9fe5ac8429bc
docs: Update NEWS
- NEWS | 2 ++
+ NEWS | 2 ++
1 file changed, 2 insertions(+)
commit 23866cb9935e9b9f7c88b26cdfc13ff95edfbe00
docs: Add JsonReader to the API reference
- doc/reference/json-glib-docs.xml | 1 +
- doc/reference/json-glib-sections.txt | 41 ++++++++++++++++++++++++++++++++++
- doc/reference/json-glib.types | 2 ++
+ doc/reference/json-glib-docs.xml | 1 +
+ doc/reference/json-glib-sections.txt | 41 ++++++++++++++++++++++++++++++++++++
+ doc/reference/json-glib.types | 2 ++
3 files changed, 44 insertions(+)
commit 10e5a1d38113b7b6e7c71da76ff11219baf1022d
similar, in spirit, to the XmlReader API provided by various platforms
and XML parsing libraries.
- .gitignore | 1 +
- json-glib/Makefile.am | 2 +
- json-glib/json-glib.h | 3 +
- json-glib/json-reader.c | 779 +++++++++++++++++++++++++++++++++++++++++
- json-glib/json-reader.h | 142 ++++++++
- json-glib/tests/Makefile.am | 10 +-
- json-glib/tests/reader-test.c | 101 ++++++
+ .gitignore | 1 +
+ json-glib/Makefile.am | 2 +
+ json-glib/json-glib.h | 3 +
+ json-glib/json-reader.c | 779 ++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-reader.h | 142 ++++++++
+ json-glib/tests/Makefile.am | 10 +-
+ json-glib/tests/reader-test.c | 101 ++++++
7 files changed, 1035 insertions(+), 3 deletions(-)
commit c3215ba1d46f7965fb58272da069bec389a174df
Bug #626669
- json-glib/tests/Makefile.am | 3 ++-
+ json-glib/tests/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 7f85693922d1e2614bcce9219d2c6521580dd360
We depend on automake 1.11, now.
- .gitignore | 3 ---
- autogen.sh | 15 +++------------
- build/autotools/Makefile.am | 2 --
- configure.ac | 1 -
+ .gitignore | 3 ---
+ autogen.sh | 15 +++------------
+ build/autotools/Makefile.am | 2 --
+ configure.ac | 1 -
4 files changed, 3 insertions(+), 18 deletions(-)
commit 26efdb4cc25cffa857e4ce36f0ad7ee6efe00634
Post-release version bump to 0.11.3
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ff7a8ff73ee214d385c64501c8b5dc682ccad1cf
Release 0.11.2 (0.12.0-rc1)
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8a91b052fba48ae6f4a61115e2fa6839e7a21509
path - otherwise this will break out-of-tree builds, e.g. when doing
a distcheck.
- json-glib/tests/Makefile.am | 2 +-
- json-glib/tests/parser-test.c | 4 ++--
+ json-glib/tests/Makefile.am | 2 +-
+ json-glib/tests/parser-test.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 2e3eaabd12829187f5a9ddacef68319442362729
build: Fix introspection dependencies
- json-glib/Makefile.am | 4 ++--
+ json-glib/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit def6d5612fbb33f9b02df80294651f5a28a83ccc
Update the NEWS file
- NEWS | 2 ++
+ NEWS | 2 ++
1 file changed, 2 insertions(+)
commit 385e6278477dfd35d591f8343deb1de2827ac2ff
docs: Update the dependencies in the README file
- README | 4 ++--
+ README | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 5e19ed2523441afd12c45a8b3f19d10fc9a37335
GIO landed in GLib 2.16, so we don't need the version bump to 2.20.
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d9b2845572123ed79a6626d90d2d2298c9c3d5a7
The output handling is pretty trivial, unlike the input handling in
JsonParser; this is a really basic convenience API.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-generator.c | 37 ++++++++++++++++++++++++++++++++++
- json-glib/json-generator.h | 22 ++++++++++++--------
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-generator.c | 37 ++++++++++++++++++++++++++++++++++++
+ json-glib/json-generator.h | 22 +++++++++++++--------
3 files changed, 52 insertions(+), 8 deletions(-)
commit c7c288b89175b1f9545d6ddff25609b7bb243041
Fix the include for json-types.h
- json-glib/json-parser.h | 2 +-
+ json-glib/json-parser.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e6ea3a6bae044ec7874dfde3b50bb337f00bb3be
Exercise the stream API in JsonParser
- json-glib/tests/Makefile.am | 2 +
- json-glib/tests/parser-test.c | 78 ++++++++++++++++++++++++++++++++++++++
- json-glib/tests/stream-load.json | 1 +
+ json-glib/tests/Makefile.am | 2 ++
+ json-glib/tests/parser-test.c | 78 ++++++++++++++++++++++++++++++++++++++++
+ json-glib/tests/stream-load.json | 1 +
3 files changed, 81 insertions(+)
commit 8cac7f2b6987803e36ff6abe012cd3e017b5b960
docs: Add the new JsonParser stream API
- doc/reference/json-glib-sections.txt | 3 +++
+ doc/reference/json-glib-sections.txt | 3 +++
1 file changed, 3 insertions(+)
commit 107e53b2daa27b99fb629dd1e2bf9bfd2729b3dd
JsonParser should be able to use a GInputStream (both synchronously and
asynchronously) to retrieve the JSON data and parse it.
- json-glib/json-parser.c | 258 +++++++++++++++++++++++++++++++++++++++++++++++
- json-glib/json-parser.h | 49 +++++----
+ json-glib/json-parser.c | 258 ++++++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-parser.h | 49 +++++----
2 files changed, 289 insertions(+), 18 deletions(-)
commit b164bb5180749aaff385f5d61866875bfbf9c552
build: Use the GIO prefix for cross-references
- doc/reference/Makefile.am | 3 ++-
+ doc/reference/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 6d317b129169352111ab16a0df9aee8b9aa5284b
Bump up the dependencies to be able to use GIO.
- configure.ac | 8 ++++----
+ configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 84230dd03b5db34da5ccef0a4926e18c22124952
docs: Fix up the cgit URL
- README | 6 +++---
+ README | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 67ad0f21ca554edcd6633014b0bce7dd8d216191
Update NEWS for the next stable release
- NEWS | 10 ++++++++++
+ NEWS | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 465880e5ccaca086fd1b881bd7175658d627318c
Fixes parallel builds.
- json-glib/Makefile.am | 2 ++
+ json-glib/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit 66e5f619d55433985460e8c641beb98e85832451
And silence gtk-doc-scanner by removing an undefined argument from
json_builder_add_null_value().
- doc/reference/json-glib-docs.xml | 3 ++-
- doc/reference/json-glib-sections.txt | 32 ++++++++++++++++++++++++++++++++
- doc/reference/json-glib.types | 2 ++
- json-glib/json-builder.c | 3 ++-
+ doc/reference/json-glib-docs.xml | 3 ++-
+ doc/reference/json-glib-sections.txt | 32 ++++++++++++++++++++++++++++++++
+ doc/reference/json-glib.types | 2 ++
+ json-glib/json-builder.c | 3 ++-
4 files changed, 38 insertions(+), 2 deletions(-)
commit 08f3073eeb0f7e2e0973abd23ba4ec978ad302d7
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- .gitignore | 1 +
- json-glib/Makefile.am | 2 +
- json-glib/json-builder.c | 682 ++++++++++++++++++++++++++++++++++++++++
- json-glib/json-builder.h | 100 ++++++
- json-glib/json-glib.h | 1 +
- json-glib/tests/Makefile.am | 3 +
- json-glib/tests/builder-test.c | 121 +++++++
+ .gitignore | 1 +
+ json-glib/Makefile.am | 2 +
+ json-glib/json-builder.c | 682 +++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-builder.h | 100 ++++++
+ json-glib/json-glib.h | 1 +
+ json-glib/tests/Makefile.am | 3 +
+ json-glib/tests/builder-test.c | 121 ++++++++
7 files changed, 910 insertions(+)
commit 3f8c8f99126dc1a70d847eded13afd4b64395250
We should not warn when asking for a string, array or object if the
contents were 'null'.
- json-glib/json-array.c | 42 +++++++++++++++++++++++++++++---------
- json-glib/json-object.c | 45 ++++++++++++++++++++++++++++++++---------
- json-glib/tests/object-test.c | 4 ++++
+ json-glib/json-array.c | 42 +++++++++++++++++++++++++++++++---------
+ json-glib/json-object.c | 45 ++++++++++++++++++++++++++++++++++---------
+ json-glib/tests/object-test.c | 4 ++++
3 files changed, 73 insertions(+), 18 deletions(-)
commit 471bcf28589e0929984c4e6a097ae273b017b3f0
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- json-glib.pc.in | 6 +++---
+ json-glib.pc.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 70b9235b50dd4257e0bf196e07f65807d65f8091
JsonNode is fully opaque, so there are no fields to annotate.
- json-glib/json-types.h | 1 -
+ json-glib/json-types.h | 1 -
1 file changed, 1 deletion(-)
commit aaf08f5c1a08c8aaec2436653114996b98ee1f8c
• Use gobject-introspection's Makefile rules, and update introspection.m4
- README | 4 +-
- build/autotools/Makefile.am | 3 --
- build/autotools/Makefile.am.silent | 6 ---
- build/autotools/introspection.m4 | 6 +++
- build/autotools/shave-libtool.in | 69 -------------------------------
- build/autotools/shave.in | 79 ------------------------------------
- build/autotools/shave.m4 | 77 -----------------------------------
- configure.ac | 46 ++++++---------------
- json-glib/Makefile.am | 47 ++++++++-------------
+ README | 4 +-
+ build/autotools/Makefile.am | 3 --
+ build/autotools/Makefile.am.silent | 6 ---
+ build/autotools/introspection.m4 | 6 +++
+ build/autotools/shave-libtool.in | 69 ---------------------------------
+ build/autotools/shave.in | 79 --------------------------------------
+ build/autotools/shave.m4 | 77 -------------------------------------
+ configure.ac | 46 +++++++---------------
+ json-glib/Makefile.am | 47 ++++++++---------------
9 files changed, 37 insertions(+), 300 deletions(-)
commit 6231cf027a8f9c3b11324c1d49a350ba55353123
EPIC. FAIL.
- json-glib/json-parser.c | 9 ++++++---
+ json-glib/json-parser.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
commit fcd07918d3ed2b31b047900da9d2fed23dddf7da
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- json-glib/json-scanner.c | 16 +++++++++++++++-
+ json-glib/json-scanner.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
commit 37a7931f91f8d79def3f4895bc349ba621a826a1
The json-debug.h header is private and not installed; hence, it should
be ignored by gtk-doc.
- doc/reference/Makefile.am | 3 ++-
+ doc/reference/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 28edd58ddfd719d107d89aa364dc208b0126c90f
There is no such thing as a 'JsonArrary' type.
- json-glib/json-parser.c | 2 +-
+ json-glib/json-parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d40045bd855bfcb73c10967d894a8e91f8675409
docs: Fix typo in JsonParserError annotation
- json-glib/json-parser.h | 2 +-
+ json-glib/json-parser.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b55d139ed0368f368c6c9c8f8adfab4c91f1f508
Thanks to: Michael Stapelberg <michael@stapelberg.de>
- json-glib/json-parser.c | 2 +-
+ json-glib/json-parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 24567790d30e314ee519c8f3756b3514c0c3fd31
its value, so it would be a good thing to actually have an error code
for that.
- json-glib/json-parser.c | 3 +--
- json-glib/json-parser.h | 2 ++
- json-glib/tests/parser-test.c | 3 ++-
+ json-glib/json-parser.c | 3 +--
+ json-glib/json-parser.h | 2 ++
+ json-glib/tests/parser-test.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
commit 08cec3b7c9202007a5abbf548f8d2f1b54d4d0b4
The code is fairly cleaner, now; and, most of all, still passes the
validation test suite - which is, you know... nice.
- json-glib/json-parser.c | 488 +++++++++++++++++++----------------------------
+ json-glib/json-parser.c | 488 ++++++++++++++++++++----------------------------
1 file changed, 200 insertions(+), 288 deletions(-)
commit 9ce82f8052290f3956c3d80c8739c214da314d42
This, frankly, is quite stupid.
- json-glib/json-parser.c | 49 ++++++++++++++++++++++++++++++++---------
- json-glib/json-parser.h | 8 +++++++
- json-glib/tests/parser-test.c | 18 +++++++--------
+ json-glib/json-parser.c | 49 ++++++++++++++++++++++++++++++++++---------
+ json-glib/json-parser.h | 8 +++++++
+ json-glib/tests/parser-test.c | 18 ++++++++--------
3 files changed, 56 insertions(+), 19 deletions(-)
commit 9d7c58b4fb5edeb8e9413acc9d509447e13962e5
We are now using bugzilla.gnome.org, since we're already hosted on
git.gnome.org.
- README | 2 +-
- configure.ac | 2 +-
+ README | 2 +-
+ configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 449656c68a3d6e0d8b96c36414b475e78b9cc272
parser-test: Add a case for double parsing in JsonObject
- json-glib/tests/parser-test.c | 3 ++-
+ json-glib/tests/parser-test.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 54756457de3f01d1a487fc6b90c5bd9b5b50bcf3
bare value parsing that is also provided by json_parse_value(). We
should kill it off to avoid redundant code.
- json-glib/json-parser.c | 57 ++---------------------------------------------
+ json-glib/json-parser.c | 57 ++-----------------------------------------------
1 file changed, 2 insertions(+), 55 deletions(-)
commit 3355987049560b4d31af22476a7c2b20c9d6665b
Print out the values we are parsing, for debug purposes.
- json-glib/json-parser.c | 8 ++++++++
+ json-glib/json-parser.c | 8 ++++++++
1 file changed, 8 insertions(+)
commit f622ee8d8ba54ddea6fbb7311a905ffab7842e8d
Epic reading fail.
- json-glib/json-generator.c | 2 +-
+ json-glib/json-generator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 90d6e0b8c334b3fd7995c126f07dd61ba0a9e0fb
The nested object test should use something that's really complex: an
object with a nested array and nested object definitions.
- json-glib/tests/parser-test.c | 21 ++++++++++++++++++++-
+ json-glib/tests/parser-test.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
commit f4c57ac4227c4edb8a4cecb784e871fbd5649ad1
trailing commas detection and the unknown tokens after an array element
or an object member definition.
- json-glib/json-parser.c | 44 ++++++++++++++++++++++++--------------------
+ json-glib/json-parser.c | 44 ++++++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 20 deletions(-)
commit b3435c6a05ecee58c64dce669ce7e44f829afc98
to nothing if JSON_ENABLE_DEBUG is disabled; they evaluate to messages
when the JSON_DEBUG environment variable is set to a debug domain.
- json-glib/Makefile.am | 4 +++-
- json-glib/json-debug.c | 37 +++++++++++++++++++++++++++++++++++++
- json-glib/json-debug.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/Makefile.am | 4 +++-
+ json-glib/json-debug.c | 37 +++++++++++++++++++++++++++++++++++++
+ json-glib/json-debug.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 1 deletion(-)
commit 88ac0d5111eb528e4c396e4c169ceee4fb046e62
tests: Add another trailing comma invalid test
- json-glib/tests/parser-test.c | 3 ++-
+ json-glib/tests/parser-test.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit c22c1151e418af9506547804d4bc9fddb60bc0f1
Verify that invalid JSON will trigger a parser error.
- json-glib/tests/parser-test.c | 53 +++++++++++++++++++++++++++++++++++++++++
+ json-glib/tests/parser-test.c | 53 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
commit 26668fe238a52a7fd8374f409fc277aaa8efa826
to actually pass. For instance: trailing and missing commas, invalid
barewords and wrong array and object closing braces.
- json-glib/json-parser.c | 117 +++++++++++++++++++++++++++++++----------------
+ json-glib/json-parser.c | 117 ++++++++++++++++++++++++++++++++----------------
1 file changed, 78 insertions(+), 39 deletions(-)
commit 7d156366e9062349fbe58344712a055839449098
• -Wno-portability: we require GNU make
• dist-bzip2: generate a bz2 tarball when distchecking
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ea666891cb1e6fc9e527ce6c93a306bc97145f16
replaced by two separate functions before releasing 0.10, but I forgot to
update the example in the documentation.
- json-glib/json-gboxed.c | 11 ++++++-----
+ json-glib/json-gboxed.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
commit 4c15bf185dcd55ae5daf6b68d2b58d32e9ac9d5c
to 0 and turn on debugging notes, in case --enable-debug and
--enable-maintainer-flags are turned off.
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit c09c2dc1c54c83fea4ef93486081fe3fab35452c
We create JsonObject structures using g_slice_new(), so we need to
initialize every member of the structure ourselves.
- json-glib/json-object.c | 1 +
+ json-glib/json-object.c | 1 +
1 file changed, 1 insertion(+)
commit cdffa0eacb52479e04460d8436a08ccecce91edf
The AM_CPPFLAGS variable is for pre-processor flags.
- tests/Makefile.am | 4 +++-
+ tests/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit f20523412e737c2dfae92ba4b9bd86177fd018a0
The tests should be compiled under the same flags as the rest of the
library.
- json-glib/tests/Makefile.am | 2 +-
+ json-glib/tests/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7b72cad780fdeb42ac1d847210bd2022376f2875
Use typed accessors instead of using GValues all around.
- json-glib/tests/generator-test.c | 145 +++++++-------------------------------
+ json-glib/tests/generator-test.c | 145 +++++++--------------------------------
1 file changed, 25 insertions(+), 120 deletions(-)
commit 3c33b61738d74b732805b497accec830b1a05796
While verifying Array.foreach() we should also verify that the list we
are iterating on is the same returned by the get_elements() method.
- json-glib/tests/array-test.c | 22 +++++++++++++++++-----
+ json-glib/tests/array-test.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
commit c8cc10985c3e7aac5ca1c03a7b443951929ed0cb
The gcov rule lives in json-glib/Makefile.am, but it would be nice to
have a similar rule in the top source directory as well.
- Makefile.am | 3 +++
+ Makefile.am | 3 +++
1 file changed, 3 insertions(+)
commit 060eddb098dd2b442f986a39aad2e7bf8c777a15
JsonGenerator creates the right output. This is now possible as we
garantee the order of a JsonObject members.
- json-glib/tests/generator-test.c | 102 +++++++++++++++++++++-----------------
+ json-glib/tests/generator-test.c | 102 +++++++++++++++++++++------------------
1 file changed, 56 insertions(+), 46 deletions(-)
commit 37a9c9544447c4a8ac36d80dd58bd38f80b0aa3c
Update the ignore file
- .gitignore | 5 +++--
+ .gitignore | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit e32a157f97d96293f6f4061e7d0008d90ff16258
tests/ directory altogether, since the conformance test suite should be
built along the json-glib/ directory.
- json-glib/tests/Makefile.am | 26 +-
- json-glib/tests/generator-test.c | 357 +++++++++++++++++++++
- json-glib/tests/parser-test.c | 632 ++++++++++++++++++++++++++++++++++++++
- tests/Makefile.am | 8 -
- tests/test-generator.c | 357 ---------------------
- tests/test-parser.c | 632 --------------------------------------
+ json-glib/tests/Makefile.am | 26 +-
+ json-glib/tests/generator-test.c | 357 ++++++++++++++++++++++
+ json-glib/tests/parser-test.c | 632 +++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am | 8 -
+ tests/test-generator.c | 357 ----------------------
+ tests/test-parser.c | 632 ---------------------------------------
6 files changed, 1006 insertions(+), 1006 deletions(-)
commit 5b4186eb60e953ddbaadcd53b1996d28b06d4a97
for each source file, and the coverage report will be extracted from
those.
- .gitignore | 7 ++++---
- build/autotools/Makefile.am | 3 ++-
- build/autotools/Makefile.am.gcov | 35 +++++++++++++++++++++++++++++++++++
- build/autotools/Makefile.am.gtest | 2 ++
- configure.ac | 25 +++++++++++++++++++++++--
- json-glib/Makefile.am | 9 ++++++---
+ .gitignore | 7 ++++---
+ build/autotools/Makefile.am | 3 ++-
+ build/autotools/Makefile.am.gcov | 35 +++++++++++++++++++++++++++++++++++
+ build/autotools/Makefile.am.gtest | 2 ++
+ configure.ac | 25 +++++++++++++++++++++++--
+ json-glib/Makefile.am | 9 ++++++---
6 files changed, 72 insertions(+), 9 deletions(-)
commit 56f56ae22d981830b696c5861e158802d31240c1
Bump to 0.11
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit dae32677d140a3ba6a15e1198b53ea0b3e1716b0
Post-release version bump to 0.10.1
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5aff66e8fae3e28c9cb6b74696170154eed303a7
Release 0.10.0
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 7258a776ea90ea4b2dcc6f1e4e440bb09c581a12
build: Enable introspection when distchecking
- Makefile.am | 2 +-
+ Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 80c5178127052e600146ca889500e263da4ebf10
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- json-glib/json-gobject.c | 4 ++--
+ json-glib/json-gobject.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit e3a57eae397926ad23e216996eda164ed6c15c63
Post-release bump to 0.9.3
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4477758b73a0712fdef5e7907f6b6f4e0878428e
Release 0.9.2 (0.10.0-rc1)
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 654f99c6b0d771cc6b4c68790ab164b0f691307d
Update NEWS
- NEWS | 15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
1 file changed, 15 insertions(+)
commit 307605046cf89ef922d1d1e7c7b95405f3ecfdfb
docs: Fix annotation for json_gobject_to_data()
- json-glib/json-gobject.c | 2 +-
+ json-glib/json-gobject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e7eb3ca4a9de1c7348dc82f528cf0858f52849dd
docs: Add missing to/from_data methods
- doc/reference/json-glib-sections.txt | 2 ++
+ doc/reference/json-glib-sections.txt | 2 ++
1 file changed, 2 insertions(+)
commit 27bb2c060a7b2ecc4839719d39b2044efe4c3e7a
docs: Add release notes to the README
- README | 12 ++++++++++--
+ README | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
commit 780d82310c47c3f07bcbaab2cefbea0d6decb899
docs: Update the README
- README | 27 ++++++++++++++++-----------
+ README | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
commit d122f9b8c09ad7e82b1a70da5d65ebba2111e6cc
Make the output of the summary a little bit nicer.
- configure.ac | 27 ++++++++++++++++++++-------
+ configure.ac | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
commit e4c4480036a82cc5177fc1f184c18019af0e805e
We should require at least 0.6.4 for GObject-Introspection, since that
version allows us to pass the .la file to g-ir-scanner.
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4445bdb04d5eebc145a1db82aa5b811e8d4ed048
the one in the documentation annotation for the GBoxed deserialization
function registration.
- json-glib/json-gobject.h | 2 +-
+ json-glib/json-gobject.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 793e827feaa9be3c4ffbe5c0425ac6bcc0c9e6d1
build: Clean up json-glib/Makefile.am rules
- json-glib/Makefile.am | 24 ++++--------------------
+ json-glib/Makefile.am | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
commit 97584658672fe4709fc7c3b24a44b477112322f7
build: Fix out-of-tree enum types file generation
- build/autotools/Makefile.am.enums | 4 ++--
+ build/autotools/Makefile.am.enums | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3cf919e9c7f3201305a1a63a3c270e422a37efed
the registration of the serialization and deserialization functions
into two distinct functions.
- doc/reference/json-glib-sections.txt | 3 +-
- json-glib/json-gboxed.c | 115 ++++++++++++++++++++++------------
- json-glib/json-gobject.c | 4 +-
- json-glib/json-gobject.h | 63 ++++++++++---------
- tests/test-serialize-boxed.c | 7 ++-
+ doc/reference/json-glib-sections.txt | 3 +-
+ json-glib/json-gboxed.c | 115 +++++++++++++++++++++++------------
+ json-glib/json-gobject.c | 4 +-
+ json-glib/json-gobject.h | 63 +++++++++----------
+ tests/test-serialize-boxed.c | 7 ++-
5 files changed, 114 insertions(+), 78 deletions(-)
commit 61d54cc9e2a3098e876e700a9248428f400a5368
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- json-glib/json-gobject.c | 7 +++++--
+ json-glib/json-gobject.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 63dc03da507a216c0764bc0e50fc62b2b77dc1b2
We can expose the default implementation through functions ourselves and
simplify the required code.
- doc/reference/json-glib-sections.txt | 4 ++
- json-glib/json-gobject.h | 28 +++++++----
- json-glib/json-serializable.c | 92 ++++++++++++++++++++++++++++++++++
+ doc/reference/json-glib-sections.txt | 4 ++
+ json-glib/json-gobject.h | 28 +++++++----
+ json-glib/json-serializable.c | 92 ++++++++++++++++++++++++++++++++++++
3 files changed, 115 insertions(+), 9 deletions(-)
commit 5f484d8c274a2b866f9a3d38eebe2baa1939b7ac
This makes it easier to detect when building without
JSON_DISABLE_DEPRECATED.
- json-glib/json-gobject.h | 4 ++--
+ json-glib/json-gobject.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3c7811bf24d4b957da730949af6795b728db5bad
Make sure that JSON-GLib is built without using deprecated API.
- json-glib/Makefile.am | 1 +
+ json-glib/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 923311ee52b77f53c5c529e497ea2a24efaf23ea
Tests should not be using API marked as deprecated.
- tests/Makefile.am | 2 +-
- tests/test-serialize-boxed.c | 4 ++--
- tests/test-serialize-complex.c | 2 +-
- tests/test-serialize-full.c | 2 +-
- tests/test-serialize-simple.c | 2 +-
+ tests/Makefile.am | 2 +-
+ tests/test-serialize-boxed.c | 4 ++--
+ tests/test-serialize-complex.c | 2 +-
+ tests/test-serialize-full.c | 2 +-
+ tests/test-serialize-simple.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
commit e3ae84e743e1d1a1a0202e900f443e143cb77f45
Verify that an object with a custom serialize_property() is effectively
what we expect it to be when it is parsed.
- tests/test-serialize-complex.c | 32 ++++++++++++++++++++++++++++++++
+ tests/test-serialize-complex.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
commit 7cebdd008a02e6cef0514f40327f94eba2a2088e
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- json-glib/json-generator.c | 7 ++++++-
+ json-glib/json-generator.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 30d4efb775cb416212c00e3ececb0f0147739f40
• Annotate the methods returning lists
- json-glib/json-array.c | 18 +++++++++---------
- json-glib/json-node.c | 15 ++++++++-------
- json-glib/json-object.c | 25 +++++++++++++------------
- json-glib/json-parser.c | 5 +++--
+ json-glib/json-array.c | 18 +++++++++---------
+ json-glib/json-node.c | 15 ++++++++-------
+ json-glib/json-object.c | 25 +++++++++++++------------
+ json-glib/json-parser.c | 5 +++--
4 files changed, 33 insertions(+), 30 deletions(-)
commit 47cd2f678a8321faac0e2d00a3538181e7bc1cbf
build: Add more flags to the maintainer cflags list
- configure.ac | 4 +++-
+ configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit ecc185d1c542f6ff41f84be026dc380f611a5d6e
static, otherwise everything will crash when trying to retrieve the
enumeration data from the GEnumClass.
- json-glib/json-enum-types.c.in | 2 +-
+ json-glib/json-enum-types.c.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 84f5af58c23b174cc9708e81ce8ccbfffa6e68eb
g_hash_table_get_keys() and g_hash_table_get_values(), since we use
the hash table only for storage and lookup purposes.
- json-glib/json-object.c | 55 ++++++-----------------------------------------
+ json-glib/json-object.c | 55 +++++++------------------------------------------
1 file changed, 7 insertions(+), 48 deletions(-)
commit a25a1ded25e5d1f605cffd6da7a5e036151aa70c
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- tests/test-parser.c | 38 +++++++++++++++++++++++++++++++++-----
+ tests/test-parser.c | 38 +++++++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 5 deletions(-)
commit 026ea0357fbe95e2acd43555e3b5d00e329c9740
A missing get_next_token() prevents getting the contents of
the tokenizer in order to place them into the JsonNode.
- json-glib/json-parser.c | 1 +
+ json-glib/json-parser.c | 1 +
1 file changed, 1 insertion(+)
commit 578111be53065a2bbeda73865bfa4e178f185649
The include file for JSON-GLib is json-glib/json-gobject.h as
well: json-glib/json-object.h does not exist.
- json-glib/Makefile.am | 11 ++++++++---
+ json-glib/Makefile.am | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
commit 8f8ce87730fc0bf102a707e84c4f6106b215cfab
string", but gsize is an unsigned type. The newly added
json_gobject_from_data() correctly uses gssize instead.
- json-glib/json-gobject.c | 63 +++++++++++++++++++++++++++++++++++++++++++---
- json-glib/json-gobject.h | 10 ++++++++
+ json-glib/json-gobject.c | 63 +++++++++++++++++++++++++++++++++++++++++++++---
+ json-glib/json-gobject.h | 10 ++++++++
2 files changed, 69 insertions(+), 4 deletions(-)
commit 00b4d200849e232cd904d23d3593d6f95252b483
Also for consistency, change the serialize() return value and
the deserialize() argument to be JsonNodes of type JSON_NODE_OBJECT.
- doc/reference/json-glib-sections.txt | 4 +-
- json-glib/json-gobject.c | 82 ++++++++++++++++++++++------------
- json-glib/json-gobject.h | 10 ++---
+ doc/reference/json-glib-sections.txt | 4 +-
+ json-glib/json-gobject.c | 82 ++++++++++++++++++++++++------------
+ json-glib/json-gobject.h | 10 ++---
3 files changed, 61 insertions(+), 35 deletions(-)
commit fc0607c740b153acc96e4df12a12b042e08e831b
The json-boxed and json-serializable sections are missing the
long description for the API reference.
- json-glib/json-gboxed.c | 49 +++++++++++++++++++++++++++++++++++++----
- json-glib/json-serializable.c | 5 ++++-
+ json-glib/json-gboxed.c | 49 +++++++++++++++++++++++++++++++++++++++----
+ json-glib/json-serializable.c | 5 ++++-
2 files changed, 49 insertions(+), 5 deletions(-)
commit 498827110f3d635e545c7351732551676a06a1bf
docs: Add the 0.10 symbols index
- doc/reference/json-glib-docs.xml | 5 +++++
+ doc/reference/json-glib-docs.xml | 5 +++++
1 file changed, 5 insertions(+)
commit 0979bbceb654c5e4b5dadf1e6f7e85bb9df87ca5
• JsonSerializable
• GBoxed-related API
- doc/reference/Makefile.am | 15 +++++++--------
- doc/reference/json-glib-docs.xml | 2 ++
- doc/reference/json-glib-sections.txt | 33 +++++++++++++++++++++++++++------
+ doc/reference/Makefile.am | 15 +++++++--------
+ doc/reference/json-glib-docs.xml | 2 ++
+ doc/reference/json-glib-sections.txt | 33 +++++++++++++++++++++++++++------
3 files changed, 36 insertions(+), 14 deletions(-)
commit 2f56ba9021ec4fe1574630404d6b24e4813cf1eb
docs: Documentation fixes for gtk-doc
- json-glib/json-gboxed.c | 8 +++++---
+ json-glib/json-gboxed.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2
the JsonBoxed API and the JsonSerialized implementation into their
separate source files.
- json-glib/Makefile.am | 4 +
- json-glib/json-gboxed.c | 275 ++++++++++++++++++++++++++++
- json-glib/json-gobject-private.h | 39 ++++
- json-glib/json-gobject.c | 371 +-------------------------------------
- json-glib/json-serializable.c | 154 ++++++++++++++++
+ json-glib/Makefile.am | 4 +
+ json-glib/json-gboxed.c | 275 +++++++++++++++++++++++++++++
+ json-glib/json-gobject-private.h | 39 ++++
+ json-glib/json-gobject.c | 371 +--------------------------------------
+ json-glib/json-serializable.c | 154 ++++++++++++++++
5 files changed, 476 insertions(+), 367 deletions(-)
commit 373fa3d9b73391b38620fbd9ce9b69f358e5f4c8
The functions mapping a GObject to and from a JsonObject should
be public, as they can be used by parsers.
- json-glib/json-gobject.c | 30 ++++++++++++++++++++++++++++--
- json-glib/json-gobject.h | 16 ++++++++++------
+ json-glib/json-gobject.c | 30 ++++++++++++++++++++++++++++--
+ json-glib/json-gobject.h | 16 ++++++++++------
2 files changed, 38 insertions(+), 8 deletions(-)
commit 85f7a8e8206168d95b3ef9c02aa584f0fae5b37e
data field, since that points to data internal to the JsonObject
we are iterating over.
- json-glib/json-gobject.c | 2 +-
+ json-glib/json-gobject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ff986ee5b8df45255f4f5ab01be0bbad893bc55e
Obviously, the whole machinery works only for GBoxed types that
register the serialization and deserialization functions.
- .gitignore | 68 +++++------
- json-glib/json-gobject.c | 264 +++++++++++++++++++++++++++++++++++++++++-
- json-glib/json-gobject.h | 37 ++++++
- tests/Makefile.am | 8 +-
- tests/test-serialize-boxed.c | 263 +++++++++++++++++++++++++++++++++++++++++
+ .gitignore | 68 +++++------
+ json-glib/json-gobject.c | 264 ++++++++++++++++++++++++++++++++++++++++++-
+ json-glib/json-gobject.h | 37 ++++++
+ tests/Makefile.am | 8 +-
+ tests/test-serialize-boxed.c | 263 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 602 insertions(+), 38 deletions(-)
commit 7f6a73a0964b66b15e8b5a9858b9bc76b010f67b
Useful for debugging and logging purposes.
- json-glib/json-node.c | 23 ++++++++++++++++++++++-
- json-glib/json-types-private.h | 2 ++
+ json-glib/json-node.c | 23 ++++++++++++++++++++++-
+ json-glib/json-types-private.h | 2 ++
2 files changed, 24 insertions(+), 1 deletion(-)
commit 3f8990f7a4c362590f19e427aae2f68f27303fe6
The stray semicolon was preventing the GPtrArray from being
updated.
- json-glib/json-gobject.c | 2 +-
+ json-glib/json-gobject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8e550ac4dbb5500a40c7adad88868ede40397db7
Fix compiler warnings (remove unused variables)
- json-glib/json-gobject.c | 3 +--
+ json-glib/json-gobject.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 3b994a52d9c34f67e4ac52aa4bb0c380789fbd60
Apparently, the MAINTAINER_CFLAGS were ignored.
- configure.ac | 1 +
+ configure.ac | 1 +
1 file changed, 1 insertion(+)
commit 0810711a7fbb915ba9397a66e77babb30765d090
Use the Automake macro to enable per-target compiler flags.
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d664f886372afbe1d54e633240e7b7e06ebc45c8
Fix compiler warnings (remove unused variables)
- tests/test-generator.c | 4 ++--
- tests/test-serialize-full.c | 1 -
+ tests/test-generator.c | 4 ++--
+ tests/test-serialize-full.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
commit 83dea3b3dd2281dca206e0873b5fed0a2a3d50de
structures, thus we fall back to the default deserialization code
path.
- json-glib/json-gobject.c | 98 ++++++++++++++++++++++++++++++++++++++-----
- tests/test-serialize-full.c | 11 ++---
+ json-glib/json-gobject.c | 98 ++++++++++++++++++++++++++++++++++++++++-----
+ tests/test-serialize-full.c | 11 ++---
2 files changed, 93 insertions(+), 16 deletions(-)
commit 2616938c7c042fced9be197205a535a8b420534e
This requires changing most of the build system to use the new
files layout.
- .gitignore | 4 +-
- Makefile.am | 5 +-
- Makefile.decl | 61 ------------------------
- build/Makefile.am | 12 ++++-
- build/autotools/Makefile.am | 21 +++++++--
- build/autotools/Makefile.am.enums | 43 +++++++++++++++++
- build/autotools/Makefile.am.gtest | 61 ++++++++++++++++++++++++
- build/autotools/Makefile.am.marshal | 45 ++++++++++++++++++
- build/autotools/Makefile.am.silent | 17 +++++++
- doc/Makefile.am | 12 ++++-
- doc/reference/Makefile.am | 5 +-
- json-glib/Makefile.am | 88 +++++++++++------------------------
- json-glib/tests/Makefile.am | 12 +++--
- tests/Makefile.am | 15 +++---
+ .gitignore | 4 +-
+ Makefile.am | 5 ++-
+ Makefile.decl | 61 -------------------------
+ build/Makefile.am | 12 ++++-
+ build/autotools/Makefile.am | 21 +++++++--
+ build/autotools/Makefile.am.enums | 43 ++++++++++++++++++
+ build/autotools/Makefile.am.gtest | 61 +++++++++++++++++++++++++
+ build/autotools/Makefile.am.marshal | 45 +++++++++++++++++++
+ build/autotools/Makefile.am.silent | 17 +++++++
+ doc/Makefile.am | 12 ++++-
+ doc/reference/Makefile.am | 5 ++-
+ json-glib/Makefile.am | 88 ++++++++++++-------------------------
+ json-glib/tests/Makefile.am | 12 +++--
+ tests/Makefile.am | 15 +++----
14 files changed, 252 insertions(+), 149 deletions(-)
commit 5406301b0e3bf74c0d7ae47a618c416d5c6dc29d
Like we deserialize them, we can serialize GObject properties
defined using GParamSpecObject.
- json-glib/json-gobject.c | 14 ++++++++++++++
+ json-glib/json-gobject.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
commit 3a2176ebf96b33716d1b50068ca44b1d3cd9b0c8
a non-default value we should specify the value when instantiating
the object.
- tests/test-serialize-simple.c | 4 ++--
+ tests/test-serialize-simple.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1ff48cdc5d773925bda1ddf8bc904a9ea6a5e643
should split out the serialization of a GObject into a JsonObject
part of json_serialize_gobject() into its own private function.
- json-glib/json-gobject.c | 113 +++++++++++++++++++++++++---------------------
+ json-glib/json-gobject.c | 113 +++++++++++++++++++++++++----------------------
1 file changed, 61 insertions(+), 52 deletions(-)
commit 27afed8dc89bf9562c3536f0a053d250e70eea4d
GObject has been updated to include a property holding a
GObject.
- json-glib/json-gobject.c | 14 ++++++++++-
- tests/test-serialize-full.c | 58 +++++++++++++++++++++++++++++++++++++------
+ json-glib/json-gobject.c | 14 ++++++++++-
+ tests/test-serialize-full.c | 58 +++++++++++++++++++++++++++++++++++++++------
2 files changed, 64 insertions(+), 8 deletions(-)
commit 317447b52455c56b0123168ab127ce026d7d0c22
we need to use the same code as json_construct_gobject(), minus
the parsing.
- json-glib/json-gobject.c | 152 +++++++++++++++++++++++++---------------------
+ json-glib/json-gobject.c | 152 ++++++++++++++++++++++++++---------------------
1 file changed, 83 insertions(+), 69 deletions(-)
commit cba7db96581343e3cbd8e5eb067026efb8cac24e
Apparently, though JSON does not guarantee any ordering, it is somewhat
expected by JSON (and ECMAScript) users.
- json-glib/json-object.c | 67 +++++++++++++++++++++-------------------
- json-glib/json-types-private.h | 3 ++
- tests/test-generator.c | 3 +-
+ json-glib/json-object.c | 67 ++++++++++++++++++++++--------------------
+ json-glib/json-types-private.h | 3 ++
+ tests/test-generator.c | 3 +-
3 files changed, 40 insertions(+), 33 deletions(-)
commit d5bebce0286aef5c4b4110c16c22a8ef3dc38405
JsonNode should mimick GValue's API and have macros for easy type checking
- doc/reference/json-glib-sections.txt | 7 ++++-
- json-glib/json-types.h | 51 ++++++++++++++++++++++++++++++++++
- json-glib/tests/node-test.c | 2 +-
+ doc/reference/json-glib-sections.txt | 7 ++++-
+ json-glib/json-types.h | 51 ++++++++++++++++++++++++++++++++++++
+ json-glib/tests/node-test.c | 2 +-
3 files changed, 58 insertions(+), 2 deletions(-)
commit 17fc731ed54b754285bac76c7ac23eac6b96bf24
associated with a JSON_NODE_VALUE node type and an empty string as
the contents.
- json-glib/tests/object-test.c | 13 +++++++++++++
- tests/test-parser.c | 1 +
+ json-glib/tests/object-test.c | 13 +++++++++++++
+ tests/test-parser.c | 1 +
2 files changed, 14 insertions(+)
commit 5181bf24bf3cde743de590ab3ffa0471df9e4799
Post-branch bump to 0.9.1
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3f83767109979c660469b3b5862fbd04469a8011
[release] 0.8.0
- NEWS | 2 ++
- configure.ac | 8 ++++++--
+ NEWS | 2 ++
+ configure.ac | 8 ++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
commit bd604338b25884edbd86cf531505259948484323
return the right expected token so that the generated syntax error
will be correct.
- json-glib/json-parser.c | 16 ++++++++++++++--
+ json-glib/json-parser.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
commit f99cf3d3d038eff786f85409f3d04736e2068e74
[parser] Whitespace clean up
- json-glib/json-parser.c | 11 ++++++-----
+ json-glib/json-parser.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
commit 6c20aae2b49a6d64db5e7d1ff3a82950ea9dc58a
AM_SILENT_RULES machinery instead of Shave - even though Shave's
output is a lot cleaner.
- autogen.sh | 2 +-
- configure.ac | 20 ++++++++++++++++----
- json-glib/Makefile.am | 6 +++++-
+ autogen.sh | 2 +-
+ configure.ac | 20 ++++++++++++++++----
+ json-glib/Makefile.am | 6 +++++-
3 files changed, 22 insertions(+), 6 deletions(-)
commit 7b4bb80930f12a366d5e5a5eea5b398972cd4891
Add the setter for JsonNode:parent, to be used in JsonParser instead
of directly accessing the JsonNode structure.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-node.c | 18 ++++++++++++++++++
- json-glib/json-parser.c | 14 +++++++-------
- json-glib/json-types.h | 2 ++
- tests/test-parser.c | 10 ++++++++++
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-node.c | 18 ++++++++++++++++++
+ json-glib/json-parser.c | 14 +++++++-------
+ json-glib/json-types.h | 2 ++
+ tests/test-parser.c | 10 ++++++++++
5 files changed, 38 insertions(+), 7 deletions(-)
commit c1b76a73e0b2c6e0c7afced10bd6079a0f5b0f5d
The code that parses a value within an object and an array should
be moved to its own function to avoid duplication.
- json-glib/json-parser.c | 199 +++++++++++++++++++----------------------------
- tests/test-parser.c | 9 ++-
+ json-glib/json-parser.c | 199 ++++++++++++++++++++----------------------------
+ tests/test-parser.c | 9 ++-
2 files changed, 86 insertions(+), 122 deletions(-)
commit d3f005c27d9a8a46259205f2f8077fb01a6a3609
Also, we should include the additional pages that gtk-doc generates
for us, like the annotations glossary and the object tree.
- doc/reference/json-glib-docs.xml | 17 +++++++++++++++++
+ doc/reference/json-glib-docs.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
commit 7442a3011a860f12cbd40b6687b699b0b648d6b7
Clean up some notes, and add introspection annotations where needed.
- json-glib/json-generator.c | 11 ++++++-----
- json-glib/json-gobject.c | 24 ++++++++++++------------
- json-glib/json-parser.c | 3 ++-
+ json-glib/json-generator.c | 11 ++++++-----
+ json-glib/json-gobject.c | 24 ++++++++++++------------
+ json-glib/json-parser.c | 3 ++-
3 files changed, 20 insertions(+), 18 deletions(-)
commit d7d1e702b1d67fa1ec830a46650a02367ce1dd29
The normalization of member names inside JsonObject was removed by
commit 8a7e0f381dc7e49745680df92ebb428f18bf4832.
- json-glib/json-object.c | 6 +-----
+ json-glib/json-object.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
commit 9362ccc891c914dbcf1be6bd067b0b37ae688057
[docs] Generate new symbols index for 0.6 and 0.8
- doc/reference/json-glib-docs.xml | 8 ++++++++
+ doc/reference/json-glib-docs.xml | 8 ++++++++
1 file changed, 8 insertions(+)
commit 087bfe83412dca8de1b2dd67c74f490e44ecb96a
[docs] Remove the version number from the title
- doc/reference/json-glib-docs.xml | 11 ++++++++---
+ doc/reference/json-glib-docs.xml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
commit c7d31d55b50b23c6c1067cb3541f73dddc12127a
Use the --name-space command line argument for gtk-doc to detect the
right namespace of JSON-GLib, and create a useful index.
- doc/reference/Makefile.am | 2 +-
+ doc/reference/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit be07ba7b983b34231ad2f0fd7fe60ae47b14ce7e
[docs] Rename main file to json-glib-docs.xml
- doc/reference/Makefile.am | 36 ++++----
- doc/reference/json-glib-docs.sgml | 163 -------------------------------------
- doc/reference/json-glib-docs.xml | 163 +++++++++++++++++++++++++++++++++++++
+ doc/reference/Makefile.am | 36 +++++----
+ doc/reference/json-glib-docs.sgml | 163 --------------------------------------
+ doc/reference/json-glib-docs.xml | 163 ++++++++++++++++++++++++++++++++++++++
3 files changed, 182 insertions(+), 180 deletions(-)
commit 9661ff342b439b5b398f7bf9ba931d6139d5143d
Post-release version bump to 0.7.7
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d5922b42604c09ba7ebcb0adc1566d0a33a99808
[release] 0.7.6 (brown paper bag)
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9a647104ca77d4c4272845fed4bfae028098afd3
Bad Emmanuele, no cookie for you.
- json-glib/json-parser.c | 12 ++++++------
- json-glib/json-scanner.c | 1 +
+ json-glib/json-parser.c | 12 ++++++------
+ json-glib/json-scanner.c | 1 +
2 files changed, 7 insertions(+), 6 deletions(-)
commit f3e0618ee1d8aa90d0ba22e9abe5c7d6b849e0ea
Post-release version bump to 0.7.5
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c1c691fc6b58a990ee9bb17504189064051d5a12
[release] 0.7.4
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 12bc49ea08c50da9a7ed53c475fe873421432ebe
Update the NEWS file
- NEWS | 2 ++
+ NEWS | 2 ++
1 file changed, 2 insertions(+)
commit 75b888c26eebf7784c5af045a8c6af353e56b2e9
When compiling the GIR into a .typelib file we can use our own
libtool script; shave will proxy it to the right place.
- json-glib/Makefile.am | 20 +++++++++++---------
+ json-glib/Makefile.am | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
commit d84c0f367b06e094ff693d60a724b9f141c33ca9
This commit enforces the single include file, using the same
policy enacted by other libraries, like: GLib, GTK+ and Clutter.
- json-glib/json-enum-types.h.in | 4 ++++
- json-glib/json-generator.h | 4 ++++
- json-glib/json-glib.h | 6 ++++++
- json-glib/json-parser.h | 4 ++++
- json-glib/json-types.h | 4 ++++
- json-glib/json-version.h.in | 4 ++++
+ json-glib/json-enum-types.h.in | 4 ++++
+ json-glib/json-generator.h | 4 ++++
+ json-glib/json-glib.h | 6 ++++++
+ json-glib/json-parser.h | 4 ++++
+ json-glib/json-types.h | 4 ++++
+ json-glib/json-version.h.in | 4 ++++
6 files changed, 26 insertions(+)
commit 3adba015e1c1f9edc7b7b2c4364d65f813216225
that if you want introspection you should be using this header
and not the plain json-glib.h.
- json-glib/Makefile.am | 2 +-
+ json-glib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a9386e20bf8e16e17a89dda24781c63bf495aa97
Do not include json-types.h, use the correct global include.
- json-glib/tests/array-test.c | 2 +-
- json-glib/tests/node-test.c | 2 +-
- json-glib/tests/object-test.c | 2 +-
+ json-glib/tests/array-test.c | 2 +-
+ json-glib/tests/node-test.c | 2 +-
+ json-glib/tests/object-test.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit 8a7e0f381dc7e49745680df92ebb428f18bf4832
entirely up to the GObject code to decide whether to sanitize
the member name or not.
- json-glib/json-object.c | 35 ++++++-----------------------------
+ json-glib/json-object.c | 35 ++++++-----------------------------
1 file changed, 6 insertions(+), 29 deletions(-)
commit ad638149c2cc1a17c0d2ad1482d932c8940c64e0
Update NEWS
- NEWS | 2 ++
+ NEWS | 2 ++
1 file changed, 2 insertions(+)
commit d87b18675ac02f42be23bf4070134690b8b9934b
float -> G_TYPE_DOUBLE
string -> G_TYPE_STRING
- json-glib/json-array.c | 4 +--
- json-glib/json-generator.c | 4 +--
- json-glib/json-gobject.c | 58 ++++++++++++++++++++++++++++++---------
- json-glib/json-node.c | 61 +++++++++++++++++++++++++++++++++--------
- json-glib/json-object.c | 4 +--
- json-glib/json-types.h | 12 ++++----
- json-glib/tests/array-test.c | 2 +-
- json-glib/tests/node-test.c | 14 +++++-----
- json-glib/tests/object-test.c | 2 +-
- tests/test-generator.c | 4 +--
- tests/test-parser.c | 4 +--
- tests/test-serialize-full.c | 9 ++----
+ json-glib/json-array.c | 4 +--
+ json-glib/json-generator.c | 4 +--
+ json-glib/json-gobject.c | 58 +++++++++++++++++++++++++++++++---------
+ json-glib/json-node.c | 61 ++++++++++++++++++++++++++++++++++---------
+ json-glib/json-object.c | 4 +--
+ json-glib/json-types.h | 12 ++++-----
+ json-glib/tests/array-test.c | 2 +-
+ json-glib/tests/node-test.c | 14 +++++-----
+ json-glib/tests/object-test.c | 2 +-
+ tests/test-generator.c | 4 +--
+ tests/test-parser.c | 4 +--
+ tests/test-serialize-full.c | 9 ++-----
12 files changed, 121 insertions(+), 57 deletions(-)
commit 7411cadc0fdd9ffc2bd7004c9980913ac857a495
Indentation fixes
- tests/test-parser.c | 98 +++++++++++++++++++++++++--------------------------
+ tests/test-parser.c | 98 ++++++++++++++++++++++++++---------------------------
1 file changed, 49 insertions(+), 49 deletions(-)
commit 112a8ec8dfd9c46304008b62e8ab256ed7714644
Thanks to Thomas Weidner for catching and reporting the issue.
- json-glib/json-parser.c | 16 +++++++++++-----
+ json-glib/json-parser.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
commit 4ecdd6bedb7961f3a33971aa1f2338115a60f7f3
integer, a floating point value or a string) is still a valid JSON
document, and JsonParser must create the correct JsonNode.
- tests/test-parser.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test-parser.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
commit 9a3b7a020716e23f1330915f1768a7c00bffbeb5
The passed value is a pointer to a JsonObject, not to a JsonArray.
- json-glib/json-object.c | 2 +-
+ json-glib/json-object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 68d872f15022217c0ff1cf516aec917d600fd762
Reviewed by Emmanuele Bassi
- json-glib/json-object.c | 2 +-
+ json-glib/json-object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6e706fb2b7a371f25c169ed25d4b617f2dc05b63
http://bugzilla.openedhand.com/show_bug.cgi?id=1648
- json-glib/json-generator.c | 43 +++++++++++++++++++++++++++++++++----------
+ json-glib/json-generator.c | 43 +++++++++++++++++++++++++++++++++----------
1 file changed, 33 insertions(+), 10 deletions(-)
commit a9416b7e2823f1fffe639d90bb352a337815a70e
Post-release bump to 0.7.3
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1d13a409bb911141653a75d44e90feac9bfc2862
[release] 0.7.2
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ff97e679522c52be6b5dfe0f851416cdeac7f921
[release] Update NEWS
- NEWS | 19 +++++++++++++++++++
+ NEWS | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
commit 182ca9cd9a3fabaa2533d841154856c61c570d08
[build] Fixes for passing distcheck
- Makefile.am | 17 ++++++++++++-----
- build/Makefile.am | 2 ++
- build/autotools/Makefile.am | 4 +++-
- doc/reference/Makefile.am | 20 +++++++++++---------
- json-glib/Makefile.am | 27 ++++++++++++++-------------
+ Makefile.am | 17 ++++++++++++-----
+ build/Makefile.am | 2 ++
+ build/autotools/Makefile.am | 4 +++-
+ doc/reference/Makefile.am | 20 +++++++++++---------
+ json-glib/Makefile.am | 27 ++++++++++++++-------------
5 files changed, 42 insertions(+), 28 deletions(-)
commit 019d8d4c1c56250cd507283c0fc478a38364e92a
The type definitions in json-types-private.h are not meant to be
documented or scanned.
- doc/reference/Makefile.am | 1 +
+ doc/reference/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 41649f049637864cfce21f6615c7d8bcaf3f03b8
[docs] Update the README file
- README | 30 ++++++++++++++++++++----------
+ README | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
commit 97fc00b1a5e3878074488ee93d9b52570983da1f
[build] Use AS_CASE m4 macro, instead of AS_IF
- configure.ac | 30 ++++++++++++++++--------------
+ configure.ac | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
commit 610cd260ac50c09809d6273c328ecea5a21f51bb
[build] Require automake 1.10
- configure.ac | 6 +++---
+ configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit bddc717b8b6f2f1501c30f78159c20394665d335
Build the Introspection data when compiling JSON-GLib; this way, the
API should be available to other languages automatically.
- .gitignore | 3 ++
- build/autotools/Makefile.am | 7 ++-
- build/autotools/introspection.m4 | 88 ++++++++++++++++++++++++++++++++++++++
- configure.ac | 13 +++---
- json-glib/Makefile.am | 30 +++++++++++++
+ .gitignore | 3 ++
+ build/autotools/Makefile.am | 7 +++-
+ build/autotools/introspection.m4 | 88 ++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 13 +++---
+ json-glib/Makefile.am | 30 ++++++++++++++
5 files changed, 135 insertions(+), 6 deletions(-)
commit 3ddeb7a8779a4c51453289aa15af130af480eea6
compiler flags supported by the C compiler. This should allow the
build to handle gracefully different versions of GCC.
- .gitignore | 1 +
- Makefile.am | 2 ++
- build/autotools/Makefile.am | 2 +-
- build/autotools/as-compiler-flag.m4 | 62 +++++++++++++++++++++++++++++++++++
- configure.ac | 5 ++-
+ .gitignore | 1 +
+ Makefile.am | 2 ++
+ build/autotools/Makefile.am | 2 +-
+ build/autotools/as-compiler-flag.m4 | 62 +++++++++++++++++++++++++++++++++++++
+ configure.ac | 5 ++-
5 files changed, 70 insertions(+), 2 deletions(-)
commit 9f817eae9fe0d09441fa78b11ef148a3f4affe22
[tests] Do not namespace with json-
- tests/test-generator.c | 10 +++++-----
- tests/test-parser.c | 18 +++++++++---------
+ tests/test-generator.c | 10 +++++-----
+ tests/test-parser.c | 18 +++++++++---------
2 files changed, 14 insertions(+), 14 deletions(-)
commit bde3da83b1a144fc0eff1db5a2aa790462bb685e
[git ignore] Add m4 files under build/
- .gitignore | 3 +++
+ .gitignore | 3 +++
1 file changed, 3 insertions(+)
commit c12786444e0175464295fb9a98c600060bffa0ed
Also, the copyright is now Intel Corp.
- json-glib/json-array.c | 8 ++++++--
- json-glib/json-generator.c | 8 ++++++--
- json-glib/json-generator.h | 8 ++++++--
- json-glib/json-glib.h | 23 +++++++++++++++++++++++
- json-glib/json-gobject.h | 8 ++++++--
- json-glib/json-node.c | 8 ++++++--
- json-glib/json-object.c | 9 ++++++---
- json-glib/json-parser.c | 8 ++++++--
- json-glib/json-parser.h | 8 ++++++--
- json-glib/json-version.h.in | 8 ++++++--
+ json-glib/json-array.c | 8 ++++++--
+ json-glib/json-generator.c | 8 ++++++--
+ json-glib/json-generator.h | 8 ++++++--
+ json-glib/json-glib.h | 23 +++++++++++++++++++++++
+ json-glib/json-gobject.h | 8 ++++++--
+ json-glib/json-node.c | 8 ++++++--
+ json-glib/json-object.c | 9 ++++++---
+ json-glib/json-parser.c | 8 ++++++--
+ json-glib/json-parser.h | 8 ++++++--
+ json-glib/json-version.h.in | 8 ++++++--
10 files changed, 77 insertions(+), 19 deletions(-)
commit 069cdc8c4ea9024b1583f074815e16e9ddf7db7f
function we can safely move everything into a private, uninstalled
header file and let JsonNode be completely opaque to the developer.
- json-glib/Makefile.am | 1 +
- json-glib/json-array.c | 9 +-----
- json-glib/json-generator.c | 2 ++
- json-glib/json-gobject.c | 2 ++
- json-glib/json-node.c | 2 +-
- json-glib/json-object.c | 9 +-----
- json-glib/json-parser.c | 2 ++
- json-glib/json-types-private.h | 61 ++++++++++++++++++++++++++++++++++++++++
- json-glib/json-types.h | 38 +++++++++----------------
- json-glib/tests/node-test.c | 8 +++---
+ json-glib/Makefile.am | 1 +
+ json-glib/json-array.c | 9 +------
+ json-glib/json-generator.c | 2 ++
+ json-glib/json-gobject.c | 2 ++
+ json-glib/json-node.c | 2 +-
+ json-glib/json-object.c | 9 +------
+ json-glib/json-parser.c | 2 ++
+ json-glib/json-types-private.h | 61 ++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-types.h | 38 ++++++++++----------------
+ json-glib/tests/node-test.c | 8 +++---
10 files changed, 89 insertions(+), 45 deletions(-)
commit 930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8
json_array_foreach_element() iterates over a JSON array data
type.
- doc/reference/json-glib-sections.txt | 2 ++
- json-glib/json-array.c | 35 +++++++++++++++++++++++++
- json-glib/json-types.h | 21 +++++++++++++++
- json-glib/tests/array-test.c | 48 ++++++++++++++++++++++++++++++++++
+ doc/reference/json-glib-sections.txt | 2 ++
+ json-glib/json-array.c | 35 ++++++++++++++++++++++++++
+ json-glib/json-types.h | 21 ++++++++++++++++
+ json-glib/tests/array-test.c | 48 ++++++++++++++++++++++++++++++++++++
4 files changed, 106 insertions(+)
commit 3057a1722e27a13b39ddec4754fb6abda1aea199
The json_object_foreach_member() function iterates over a JsonObject
data type.
- doc/reference/json-glib-sections.txt | 2 ++
- json-glib/json-object.c | 55 ++++++++++++++++++++++++++++++++
- json-glib/json-types.h | 25 +++++++++++++--
- json-glib/tests/object-test.c | 57 ++++++++++++++++++++++++++++++++++
+ doc/reference/json-glib-sections.txt | 2 ++
+ json-glib/json-object.c | 55 ++++++++++++++++++++++++++++++++++
+ json-glib/json-types.h | 25 ++++++++++++++--
+ json-glib/tests/object-test.c | 57 ++++++++++++++++++++++++++++++++++++
4 files changed, 137 insertions(+), 2 deletions(-)
commit 5778210462b8b7a1a5d98466508276f712ea8c47
be using the same pattern used by the G_DEFINE_TYPE() macros,
with GOnce to enable atomic (and thread-safe) type registration.
- json-glib/json-enum-types.c.in | 18 +++++++++++++-----
+ json-glib/json-enum-types.c.in | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
commit 43d4bd151cd6979ecc6fdad5fab3e7988117c7be
[doap] Add a category element
- json-glib.doap | 1 +
+ json-glib.doap | 1 +
1 file changed, 1 insertion(+)
commit 58999bddac74c176fbd8544fa2cd30e2f067d863
The json_node_is_null() function is just a quick check for
nodes set to null.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-node.c | 20 ++++++++++++++++++++
- json-glib/json-types.h | 1 +
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-node.c | 20 ++++++++++++++++++++
+ json-glib/json-types.h | 1 +
3 files changed, 22 insertions(+)
commit ba46d8e07a8e2dd50a3b1fff8b8c3303e3686480
function which hides the JsonNode.type structure field and gives
us a little bit more of future compatibility.
- json-glib/json-types.h | 2 +-
+ json-glib/json-types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d1e7d1ecd05687624f7149dad75a5fac9a645e72
First pass at adding some type safety to the JsonNode type checks,
and at removing every mention of the JsonNode interna fields.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-node.c | 18 ++++++++++++++++++
- json-glib/json-types.h | 5 +++--
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-node.c | 18 ++++++++++++++++++
+ json-glib/json-types.h | 5 +++--
3 files changed, 22 insertions(+), 2 deletions(-)
commit f2f43d17254317d35ea0cc8206592ecbcb856b68
JsonArray and JsonSerializable type names should be interned like
the rest of the types.
- json-glib/json-array.c | 2 +-
- json-glib/json-gobject.c | 3 ++-
+ json-glib/json-array.c | 2 +-
+ json-glib/json-gobject.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
commit bfcc50d5b199e72ed3e5a7556ac2294442e3ac55
when using its contents as the version entity in the API reference
docbook.
- doc/reference/version.xml.in | 2 +-
+ doc/reference/version.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cbc92b72b2d7870a916f24055f8c2aa2371aa4ea
the typed JsonNode accessors and the newly added JsonObject and
JsonArray typed accessors.
- tests/test-generator.c | 63 ++++++++----------------------------------------
+ tests/test-generator.c | 63 ++++++++------------------------------------------
1 file changed, 10 insertions(+), 53 deletions(-)
commit e437ce609e333c5b8ede21174dfba032c1bbfb00
As for JsonObject, the amount of types is small enough to avoid
the combinatorial API explosion.
- doc/reference/json-glib-sections.txt | 22 +-
- json-glib/json-array.c | 386 ++++++++++++++++++++++++++++++++++
- json-glib/json-types.h | 57 +++--
+ doc/reference/json-glib-sections.txt | 22 +-
+ json-glib/json-array.c | 386 +++++++++++++++++++++++++++++++++++
+ json-glib/json-types.h | 57 ++++--
3 files changed, 447 insertions(+), 18 deletions(-)
commit 4819ca625d1b73270797f913495a3835297950c2
library, we should restore the sanity and use json_object_set_member()
instead.
- json-glib/json-gobject.c | 2 +-
- json-glib/json-parser.c | 6 +++---
- json-glib/tests/node-test.c | 2 +-
- json-glib/tests/object-test.c | 4 ++--
- tests/test-generator.c | 26 +++++++++++++-------------
- tests/test-serialize-complex.c | 4 ++--
- tests/test-serialize-full.c | 4 ++--
+ json-glib/json-gobject.c | 2 +-
+ json-glib/json-parser.c | 6 +++---
+ json-glib/tests/node-test.c | 2 +-
+ json-glib/tests/object-test.c | 4 ++--
+ tests/test-generator.c | 26 +++++++++++++-------------
+ tests/test-serialize-complex.c | 4 ++--
+ tests/test-serialize-full.c | 4 ++--
7 files changed, 24 insertions(+), 24 deletions(-)
commit 5bb6ea91accb1d35f0ea4dae8f2b8f71bdbd134d
since the amount of valid types we can add to a JsonObject is limited,
this does not lead to a combinatorial API explosion.
- doc/reference/json-glib-sections.txt | 17 ++
- json-glib/json-object.c | 489 ++++++++++++++++++++++++++++++++--
- json-glib/json-types.h | 83 ++++--
+ doc/reference/json-glib-sections.txt | 17 ++
+ json-glib/json-object.c | 489 +++++++++++++++++++++++++++++++++--
+ json-glib/json-types.h | 83 ++++--
3 files changed, 555 insertions(+), 34 deletions(-)
commit 2a768cb5e553afc4a9ac0d9bf1dc36a183821983
description of the maintainer/author of a project to specify the
GNOME userid.
- json-glib.doap | 3 +++
+ json-glib.doap | 3 +++
1 file changed, 3 insertions(+)
commit 17822292acb4d1c9b4f414ea0e4b858809d3b858
Describe the releases of the 0.6 cycle.
- json-glib.doap | 18 ++++++++++++++++++
+ json-glib.doap | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit 470f3a4299153362deea260c806d9b87870af3de
Use DOAP (Description Of A Project) to describe JSON-GLib. The
GNOME Cgit instance will pick up the DOAP file and update itself.
- json-glib.doap | 30 ++++++++++++++++++++++++++++++
+ json-glib.doap | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
commit 764a3f79fe0d8d13e24bd921a16a46f4603bcbf1
Every GNOME project needs a MAINTAINERS file.
- MAINTAINERS | 3 +++
+ MAINTAINERS | 3 +++
1 file changed, 3 insertions(+)
commit f9956b4eadcfc9bbd5c0bc4b861ff782779e8a9a
In order to catch potential regressions, we also need a more
thorough test unit for the JsonNode copy operation.
- json-glib/json-node.c | 2 +-
- json-glib/tests/node-test.c | 45 +++++++++++++++++++++++++++++++++++++++++--
+ json-glib/json-node.c | 2 +-
+ json-glib/tests/node-test.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 44 insertions(+), 3 deletions(-)
commit e2c65a75d68aafa26f2084928e732961e48beb99
Also, use Shave to sanitize the libtool and compiler incantations
and restore sanity to the build system.
- .gitignore | 5 +++
- autogen.sh | 9 ++++
- build/Makefile.am | 1 +
- build/autotools/Makefile.am | 3 ++
- build/autotools/shave-libtool.in | 69 +++++++++++++++++++++++++++++
- build/autotools/shave.in | 79 +++++++++++++++++++++++++++++++++
- build/autotools/shave.m4 | 77 ++++++++++++++++++++++++++++++++
- configure.ac | 90 +++++++++++++++++++++-----------------
- json-glib/Makefile.am | 89 +++++++++++++++++++------------------
+ .gitignore | 5 +++
+ autogen.sh | 9 ++++
+ build/Makefile.am | 1 +
+ build/autotools/Makefile.am | 3 ++
+ build/autotools/shave-libtool.in | 69 ++++++++++++++++++++++++++++++
+ build/autotools/shave.in | 79 +++++++++++++++++++++++++++++++++++
+ build/autotools/shave.m4 | 77 ++++++++++++++++++++++++++++++++++
+ configure.ac | 90 +++++++++++++++++++++++-----------------
+ json-glib/Makefile.am | 89 ++++++++++++++++++++-------------------
9 files changed, 340 insertions(+), 82 deletions(-)
commit 8080df63b4b4eae3b59d1214fc67f48149f49773
Thanks to: Gordon Williams <gordon.williams@collabora.co.uk>
- json-glib/json-parser.c | 38 +++++++++++++++++++++++++++++++++-----
+ json-glib/json-parser.c | 38 +++++++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 5 deletions(-)
commit ca329a7d5c1185cdf15fb85891693eca30295de1
Since I decided to rant about assignments in JSON definitions,
I also need to show what an assignment looks like.
- json-glib/json-parser.c | 17 ++++++++++++-----
+ json-glib/json-parser.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
commit b28d5894060aac1239e23665f42be3946b5450e7
Add more spaces and remove the ` from the error message.
- json-glib/json-parser.c | 18 ++++++++++++------
+ json-glib/json-parser.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
commit a19a51df9e95e36edf949e68581731bd31959081
Reported by: Jasper <jasper@humppa.nl>
- tests/test-serialize-full.c | 2 +-
+ tests/test-serialize-full.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e583a9ec95f3d157091ec1e1a2ac8c493f0e23b2
When setting up the build environment we should use the tools that
GNOME provides instead of calling autoreconf.
- autogen.sh | 21 ++++++++-------------
+ autogen.sh | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
commit 1d92c73bc05423872581d513f355783d4864edd5
perform type checks and requires that the length of the memory buffer
containing the JSON data stream is already a positive integer.
- json-glib/json-parser.c | 175 ++++++++++++++++++++++++++++-------------------
+ json-glib/json-parser.c | 175 ++++++++++++++++++++++++++++--------------------
1 file changed, 103 insertions(+), 72 deletions(-)
commit 6e7958785096806b3ffa60a4937642d713a051f2
handler when populating the GError or when printing the warning
directly on stderr.
- json-glib/json-parser.c | 28 ++++++++++++++++++++++++++--
+ json-glib/json-parser.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
commit a5bea353dead0bd69f9664df86050fc829a2dcd5
Bump to 0.7.1 after stable branch
- configure.ac | 6 +++---
+ configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit cf4c7360c69c0fe7587ec2456cd10839e1d0c1d6
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
- json-glib/json-gobject.c | 4 +++-
+ json-glib/json-gobject.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 9b94bc7f99063f45a2725861369f36b53ec3d440
Sync up with the current stable release numbers
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 4dd392342003147d55eee98db50e11d344b287d4
Fix a variable shadowing
- json-glib/json-generator.c | 3 ++-
+ json-glib/json-generator.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit a02a42ef47e61456747e511556097b903f07d68a
This commit disables recursion in the tests/ and json-glib/tests
when the ENABLE_GLIB_TEST Makefile conditional has been set.
- Makefile.am | 6 +++++-
- configure.ac | 3 +++
- json-glib/Makefile.am | 2 ++
+ Makefile.am | 6 +++++-
+ configure.ac | 3 +++
+ json-glib/Makefile.am | 2 ++
3 files changed, 10 insertions(+), 1 deletion(-)
commit fdbad1cfd6ad6da9fab631f945ab8d2e85228fdf
Signed-off-by: Emmanuele Bassi <ebassi@openedhand.com>
- json-glib/json-generator.c | 17 ++++++++++++++++-
+ json-glib/json-generator.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
commit 81c02ef3db6901655f8a7117e5e2675d37096daf
The json-scanner.h header file is not shipped with JSON-GLib anymore.
- json-glib/json-glib.h | 1 -
+ json-glib/json-glib.h | 1 -
1 file changed, 1 deletion(-)
commit 9713843a4294b3e35a29125bf2bf1867a6443f27
Remove debian packaging
- debian/changelog | 5 ----
- debian/compat | 1 -
- debian/control | 61 ---------------------------------------
- debian/copyright | 27 -----------------
- debian/libjson-glib-dev.install | 3 --
- debian/libjson-glib-doc.install | 1 -
- debian/libjson-glib-doc.links | 1 -
- debian/libjson-glib0.install | 1 -
- debian/rules | 12 --------
+ debian/changelog | 5 ----
+ debian/compat | 1 -
+ debian/control | 61 -----------------------------------------
+ debian/copyright | 27 ------------------
+ debian/libjson-glib-dev.install | 3 --
+ debian/libjson-glib-doc.install | 1 -
+ debian/libjson-glib-doc.links | 1 -
+ debian/libjson-glib0.install | 1 -
+ debian/rules | 12 --------
9 files changed, 112 deletions(-)
commit d67000ab6c5ae6710f48f0517c98600af7cdaa0e
Update changelog for the debian packages
- debian/changelog | 3 +--
+ debian/changelog | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 0830873edc5203655f04868184cedb428b6d2d54
Update git ignore file
- .gitignore | 72 +++++++++++++++++++-----------------------------------------
+ .gitignore | 72 +++++++++++++++++++-------------------------------------------
1 file changed, 22 insertions(+), 50 deletions(-)
commit eb1cd29f78ff52e3ec3b063716fb86b5f2c5ae4a
repository and official packages, so there's no point in duplicating
the effort here.
- Makefile.am | 6 +-
- configure.ac | 15 -----
- contrib/Makefile.am | 6 --
- contrib/json-glib-1.0.deps | 1 -
- contrib/json-glib-1.0.vapi | 139 --------------------------------------------
- contrib/json-object.vala | 46 ---------------
- contrib/json-test.vala | 122 --------------------------------------
+ Makefile.am | 6 +-
+ configure.ac | 15 -----
+ contrib/Makefile.am | 6 --
+ contrib/json-glib-1.0.deps | 1 -
+ contrib/json-glib-1.0.vapi | 139 ---------------------------------------------
+ contrib/json-object.vala | 46 ---------------
+ contrib/json-test.vala | 122 ---------------------------------------
7 files changed, 1 insertion(+), 334 deletions(-)
commit 094acd1663210e803a8dab496f6de8066ef11f44
Bump to 0.6.1
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a725bac9a287883f2d4f32130c7faedb121f754b
Bump to 0.6.0
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit cd598180b12a212525427a8cddf11bc0ed4f1836
Update NEWS for 0.6.0
- NEWS | 5 +++++
+ NEWS | 5 +++++
1 file changed, 5 insertions(+)
commit 26479ec3c342889a2ee822bdf73f2e5fb6e170d7
Fix a distcheck error because json-scanner.h is not packaged inside
the tarball.
- json-glib/Makefile.am | 1 +
+ json-glib/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 705a73eb3dfa2323ec86c1d299b567a15acde7a6
Style fixes for the configure output
- configure.ac | 10 +++++-----
+ configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit e017d392a281594e350a8d74c142cbe014753d7e
The correct syntax for passing the versioning information to
libtool is '-version-info', not '-versio-info'.
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2051be2f7185733bbc62d10ec096538fec924638
the URL to the configure.ac template, the configure script will print
it when invoked with the --help command line switch.
- configure.ac | 7 ++++++-
+ configure.ac | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 4cb8a9078172c5f56ac5d56417b8656a7053df4a
If gtk-doc is not installed (for instance, on an embedded minimal
set up), do not fail and just provide a stub gtk-doc.make.
- autogen.sh | 28 +++++++++++++++++++++++++---
+ autogen.sh | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
commit 1571fcddd6f2a245f4bb6ad64f82d24fc9c4cec0
deserialization and serialization code. We need to test that
they are correctly parsed and assigned to the instance.
- tests/test-serialize-full.c | 29 +++++++++++++++++++++++++++--
+ tests/test-serialize-full.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
commit 4c11d0969a44bb70acf6463ef6305999ff443be2
used to build the string buffer and then split it might exist in
one of the original strings).
- json-glib/json-gobject.c | 15 +++++----------
+ json-glib/json-gobject.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
commit 7ff91344d21b0c26d3a3a2834dbf09286cb1f904
This is why copying existing debian/rules templates is not a good
idea unless you read the Debian packaging rules.
- debian/rules | 3 ---
+ debian/rules | 3 ---
1 file changed, 3 deletions(-)
commit e75321e64f17d69beac0c2e131572fe081680b08
The debian packaging files are obviously needed to generate Debian
packages for JSON-GLib.
- debian/changelog | 6 ++++
- debian/compat | 1 +
- debian/control | 61 +++++++++++++++++++++++++++++++++++++++
- debian/copyright | 27 +++++++++++++++++
- debian/libjson-glib-dev.install | 3 ++
- debian/libjson-glib-doc.install | 1 +
- debian/libjson-glib-doc.links | 1 +
- debian/libjson-glib0.install | 1 +
- debian/rules | 15 ++++++++++
+ debian/changelog | 6 ++++
+ debian/compat | 1 +
+ debian/control | 61 +++++++++++++++++++++++++++++++++++++++++
+ debian/copyright | 27 ++++++++++++++++++
+ debian/libjson-glib-dev.install | 3 ++
+ debian/libjson-glib-doc.install | 1 +
+ debian/libjson-glib-doc.links | 1 +
+ debian/libjson-glib0.install | 1 +
+ debian/rules | 15 ++++++++++
9 files changed, 116 insertions(+)
commit 30f9d47ecf43a17610cd9c0074ff832bfa37593c
Test the equality of the serialize string length
- tests/test-serialize-simple.c | 3 +++
+ tests/test-serialize-simple.c | 3 +++
1 file changed, 3 insertions(+)
commit 07c2b916dadb4b40fbaabf49f0e80941993cc2cf
is not "json" are to considered private, and thus are not global
to the shared object.
- json-glib/Makefile.am | 6 +++++-
+ json-glib/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 179899e5da801fda0981a1d446ba420efd4021c1
Update git ignore file
- .gitignore | 4 ++++
+ .gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit b0daf7e3a2529dd9950d77a96a10233d68778f32
When including json-glib/json-glib.h we get everything json-glib
expose as a public symbol.
- json-glib/json-glib.h | 1 +
+ json-glib/json-glib.h | 1 +
1 file changed, 1 insertion(+)
commit c7a7f429565195fe7aba56a254abf3637cf6fa8a
types are already documented, and the get_type() function and
macro are implied.
- doc/reference/Makefile.am | 2 ++
+ doc/reference/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit 053bf43c813799c5f59e9241217fe31c560b5885
The enumeration GTypes are public and meant to be used by
language bindings and other users of the library.
- json-glib/Makefile.am | 1 +
+ json-glib/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 5977d95866cd9763e97a47d6c9909e6a2fbf0ed1
Autogenerate the GTypes for the enumerations
- json-glib/Makefile.am | 70 +++++++++++++++++++++++++++++++++----------------
+ json-glib/Makefile.am | 70 ++++++++++++++++++++++++++++++++++-----------------
1 file changed, 47 insertions(+), 23 deletions(-)
commit 356413e8840a614914b84f40b1d8476ba036ded4
The templates for glib-mkenums keep the Makefile.am sane and
editable by mere mortals.
- json-glib/json-enum-types.c.in | 31 +++++++++++++++++++++++++++++++
- json-glib/json-enum-types.h.in | 26 ++++++++++++++++++++++++++
+ json-glib/json-enum-types.c.in | 31 +++++++++++++++++++++++++++++++
+ json-glib/json-enum-types.h.in | 26 ++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
commit 7d57ffc03783defbfeb26e21a14e3df32555c29d
Update git ignore file
- .gitignore | 1 +
+ .gitignore | 1 +
1 file changed, 1 insertion(+)
commit 7d259e03b9a556d155ade87417ab26830c3e7684
and that the returned variable is not NULL, but also that the
returned variable name is correct.
- tests/test-parser.c | 16 ++++++++++------
+ tests/test-parser.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
commit 6899bca0dcf72dac0cad9dcf1a7cd10159d471e5
Try more combinations of elements inside an array with a nested
object.
- tests/test-parser.c | 2 ++
+ tests/test-parser.c | 2 ++
1 file changed, 2 insertions(+)
commit 81addb645ac5fad28619bb660624902abe981377
The unicode escaping unit should have the same verbosity as the
other units.
- tests/test-parser.c | 4 ++++
+ tests/test-parser.c | 4 ++++
1 file changed, 4 insertions(+)
commit 22a0db88c14895f98db76bca3cb078fbd3a2b07d
Whitespace fixes in the licensing notice
- json-glib/json-scanner.h | 2 +-
+ json-glib/json-scanner.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 676592cef006de16d966a1ca0469ccd0556f0e4b
Documentation fixes in JsonNode
- json-glib/json-node.c | 6 +++---
+ json-glib/json-node.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit bf2249a1855b6bebe0b3528b4d5321a1ebe4b9e7
If the source JsonNode does not contain data yet, do not try
and copy it.
- json-glib/json-node.c | 17 +++++++++++++----
+ json-glib/json-node.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
commit c191b2f8a8159457db3333390be10d6c7c0d4336
where it belongs, so we can remove it from the (private) subsection
of the json-parser section.
- doc/reference/Makefile.am | 7 ++++++-
- doc/reference/json-glib-sections.txt | 1 -
+ doc/reference/Makefile.am | 7 ++++++-
+ doc/reference/json-glib-sections.txt | 1 -
2 files changed, 6 insertions(+), 2 deletions(-)
commit ffbd9063556a061ba3e7e4223b924ae4766adfbd
not be used outside JSON-GLib - JsonParser is the public API for
parsing JSON.
- json-glib/Makefile.am | 5 +++--
+ json-glib/Makefile.am | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit df2a310a6ed0a3b32415f53076ff4c053b3fd925
Since we are using GLib and GObject it would be nice to backlink
to them inside our API reference.
- doc/reference/Makefile.am | 7 ++++---
+ doc/reference/Makefile.am | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 6a3d8266efe505b29555db21658c241eba20fe2d
libraries documentation; in order to get it, we can ask the
pkg-config file of the library for its prefix.
- configure.ac | 5 +++++
+ configure.ac | 5 +++++
1 file changed, 5 insertions(+)
commit 4e5ec69cce8ab27f965985ba69ea11224ae39ffd
Update the description and dependencies
- README | 7 ++++++-
+ README | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit f65a5d5e30a1242a899149b732d1139891876014
Bump to 0.5.1
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ab0da7c61bde715e99dd16027b198c7760b30922
Update for 0.5.0 release
- NEWS | 14 ++++++++++++++
+ NEWS | 14 ++++++++++++++
1 file changed, 14 insertions(+)
commit 203927c71231cf6cec6d88161211702b7105df2d
Fix ignore rule
- .gitignore | 2 +-
+ .gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 76921ac27534aa0a25b39790ce4d99cf6e19a20c
Check that JsonParser correctly handles Unicode characters escaped
using the \uXXXX notation, as per RFC.
- tests/test-parser.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test-parser.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
commit 379a2fe972c6e7436be9f345fe018bf4fe575354
This allows full compatibility with JSON.
- json-glib/json-scanner.c | 56 +++++++++++++++++++++++++++++++++++++++++-----
+ json-glib/json-scanner.c | 56 ++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 50 insertions(+), 6 deletions(-)
commit 9429ecaa88cdb6705189b6970481911f11339ff6
should not barf out when encountering a JSON_NODE_NULL instead of the
expected JSON_NODE_VALUE.
- json-glib/json-node.c | 21 +++++++++++++++------
+ json-glib/json-node.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
commit 4e826d9f209a8f68023bae54c91b2bbbb202a54a
Wrap the test report information section inside an info element
- Makefile.decl | 6 ++++--
+ Makefile.decl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 8e2e539d02b84e0fe452174f3dfab06f35a4e6a1
Test the GValue API for storing fundamental types into a JsonNode.
- json-glib/tests/node-test.c | 29 +++++++++++++++++++++++++++++
+ json-glib/tests/node-test.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
commit 646b90e79d3424a332064a6a1e9fc62d1ce99386
Add package and version information to the test-report XML
- Makefile.decl | 2 ++
+ Makefile.decl | 2 ++
1 file changed, 2 insertions(+)
commit b8943381b0df44d9e6e21ae8321df2376c8458a8
Use a similar test unit as the JsonArray one, testing creation, empty
objects, addition and removal of members.
- .gitignore | 2 ++
- json-glib/tests/Makefile.am | 17 +++++++----
- json-glib/tests/object-test.c | 62 +++++++++++++++++++++++++++++++++++++++++
+ .gitignore | 2 ++
+ json-glib/tests/Makefile.am | 17 +++++++-----
+ json-glib/tests/object-test.c | 62 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 75 insertions(+), 6 deletions(-)
commit 7eab612d9b200aef197fa1dffa4f89b936c76b1f
and set up a separate test case for the element removal. This keeps the
test cases clean.
- json-glib/tests/array-test.c | 12 ++++++++++++
+ json-glib/tests/array-test.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit 6aa1ddb891594e0f567bc3ebeb3bf5d3ab8e7e0c
Clean the test-report XML output, if found
- Makefile.am | 2 +-
+ Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6eee8282d327614380854d572b2680f40b2faaf5
Update gitignore file
- .gitignore | 18 ++++++++----------
+ .gitignore | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
commit d5cb48681c68c3d53d8ec331ef37fb60820a9421
The API coverage for the data types is part of the json-glib/tests
directory and will be expanded later.
- tests/Makefile.am | 8 +++++--
- tests/test-serialize-full.c | 56 +++++++++++++++++++++++++++----------------
+ tests/Makefile.am | 8 +++++--
+ tests/test-serialize-full.c | 56 ++++++++++++++++++++++++++++-----------------
2 files changed, 41 insertions(+), 23 deletions(-)
commit 1f6307ea2d7dc6ebe279d08b9f95f3074fbdd462
The test-08 case was the last numbered test unit.
- tests/test-08.c | 337 -------------------------------------------
- tests/test-serialize-full.c | 337 +++++++++++++++++++++++++++++++++++++++++++
+ tests/test-08.c | 337 --------------------------------------------
+ tests/test-serialize-full.c | 337 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 337 insertions(+), 337 deletions(-)
commit cdb194e8d64343e8bcb00e046c5fbeefd677b02a
interface; the TestObject implements the serialization interface to
create a JSON data type from a boxed GType.
- tests/Makefile.am | 4 +
- tests/test-07.c | 252 --------------------------------------
- tests/test-serialize-complex.c | 261 ++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am | 4 +
+ tests/test-07.c | 252 ---------------------------------------
+ tests/test-serialize-complex.c | 261 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 265 insertions(+), 252 deletions(-)
commit 4c766a029d8f6a2d06b749527020fd93fc4a4f99
The new test-serialize-simple tests the GObject integration for
serializing simple GObjects into JSON.
- tests/Makefile.am | 4 ++++
- tests/test-serialize-simple.c | 5 +++--
+ tests/Makefile.am | 4 ++++
+ tests/test-serialize-simple.c | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit 325185c5955f8942ddf8d55a9e3b5d6a8c2723d1
Rename test-06 to test-serialize-simple
- tests/test-06.c | 162 -----------------------------------------
- tests/test-serialize-simple.c | 162 +++++++++++++++++++++++++++++++++++++++++
+ tests/test-06.c | 162 ------------------------------------------
+ tests/test-serialize-simple.c | 162 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 162 insertions(+), 162 deletions(-)
commit cbea4698c1b7284d8004fff659a7354fb3af29ee
First pass into replacing the last three numbered tests into named
tests.
- tests/test-06.c | 28 ++++++++++++++++++----------
+ tests/test-06.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
commit 5cc1d3d6061830de403ccbc10c2414f29cd1cf82
with it being an associative array. Hence, for the object test case we
just compare the length of the output.
- tests/Makefile.am | 4 +
- tests/test-04.c | 238 -----------------------------
- tests/test-05.c | 227 ---------------------------
- tests/test-generator.c | 399 ++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am | 4 +
+ tests/test-04.c | 238 -----------------------------
+ tests/test-05.c | 227 ----------------------------
+ tests/test-generator.c | 399 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 403 insertions(+), 465 deletions(-)
commit e100c69a4fca046cbeb6db3fc8ba49160796d87c
Append to EXTRA_DIST, since it was defined elsewhere
- contrib/Makefile.am | 2 +-
+ contrib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 98b6e5e2f151c4ee800754675bf01e585fee850b
Update the README
- README | 36 ++++++++++++++++++++++++++++++++++++
+ README | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
commit 1a078c783a5a03b3367ce59eb25248dd6e23b5c6
Update the README
- README | 36 ++++++++++++++++++++++++++++++++++++
+ README | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
commit 44891ea1040ceae95a994b646174696de7779ea1
Update gitignore file
- .gitignore | 11 +++++------
+ .gitignore | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
commit 3ea189acf52ea39653c6505c136f1f45a660a24c
Like for the simple arrays test case, add validation of the values types
for the members of the simple objects test case.
- tests/test-parser.c | 31 ++++++++++++++++++++++++-------
+ tests/test-parser.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
commit 40b3e9330f482e002aea90b0c1a4b9db2adffff0
All the fields are checked for a match. This makes the simple arrays test
case more reliable.
- tests/test-parser.c | 40 +++++++++++++++++++++++++++++++---------
+ tests/test-parser.c | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
commit 7e6dab14302b94979672acf81eec8710ea95e288
This simple unit will test the JsonArray API, as part of the coverage
test for the JSON-GLib types.
- json-glib/tests/Makefile.am | 10 ++++++---
- json-glib/tests/array-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++
+ json-glib/tests/Makefile.am | 10 ++++++---
+ json-glib/tests/array-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 3 deletions(-)
commit 441ee88a6e024fc5ab2cf8355adad1fecc276088
all the JsonParser test cases. It still needs further testing to
verify the DOM created by the parser object.
- tests/test-02.c | 225 ---------------------------------------------------
- tests/test-03.c | 214 ------------------------------------------------
- tests/test-parser.c | 167 ++++++++++++++++++++++++++++++++++++--
+ tests/test-02.c | 225 ----------------------------------------------------
+ tests/test-03.c | 214 -------------------------------------------------
+ tests/test-parser.c | 167 ++++++++++++++++++++++++++++++++++++--
3 files changed, 161 insertions(+), 445 deletions(-)
commit 71db86d84a5544d603b03721891e0ad14f92178d
the JSON-GObject integration API, by reusing the previous test cases
and remolding them into a more interesting test framework.
- tests/Makefile.am | 39 +++++----------------------------------
+ tests/Makefile.am | 39 +++++----------------------------------
1 file changed, 5 insertions(+), 34 deletions(-)
commit 1e6aa16a2a6432cf96d0a86d4650c13e63c67e43
Remove old, empty string test
- tests/test-01.c | 57 -------------------------------------------------------
+ tests/test-01.c | 57 ---------------------------------------------------------
1 file changed, 57 deletions(-)
commit 989c807fd61cc65c1e4058c5d0794ae2fe438ba1
The JsonObject parsing test will also be merged later.
- tests/test-parser.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/test-parser.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 262 insertions(+)
commit f1e1c0e7796903abb725e8216fc54f53573ecdc9
This is the first test of the old test suite to be ported to the new test
framework API.
- tests/test-01.c | 44 +++++++++++++++++++++++++++++++++++---------
+ tests/test-01.c | 44 +++++++++++++++++++++++++++++++++++---------
1 file changed, 35 insertions(+), 9 deletions(-)
commit cb5b3d5fa6244b0d20258203bd9df7e3148af57b
The test unit copies a NULL JsonNode and checks that the copy and the
original nodes are equivalent.
- json-glib/tests/node-test.c | 15 +++++++++++++++
+ json-glib/tests/node-test.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
commit 40c757835e329fe01f8f22aba74d2e47f3a5e55c
Update Makefile templates to include the testing framework
- contrib/Makefile.am | 2 ++
- doc/Makefile.am | 2 ++
- doc/reference/Makefile.am | 1 +
- tests/Makefile.am | 38 ++++++++++++++++++++++++++++++++------
+ contrib/Makefile.am | 2 ++
+ doc/Makefile.am | 2 ++
+ doc/reference/Makefile.am | 1 +
+ tests/Makefile.am | 38 ++++++++++++++++++++++++++++++++------
4 files changed, 37 insertions(+), 6 deletions(-)
commit 75939c2b43430583150b18f0a8e82e3d60a4f4f1
Update gitignore file
- .gitignore | 4 ++++
+ .gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit e4be0d896359cc1d0ba99dd81a66855389ebd5df
At the moment, there is a simple test for the JsonNode API, with a
single unit for the "null" node type.
- Makefile.am | 4 ++-
- Makefile.decl | 57 +++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 3 ++-
- json-glib/Makefile.am | 9 ++++++-
- json-glib/tests/Makefile.am | 15 ++++++++++++
- json-glib/tests/node-test.c | 27 ++++++++++++++++++++
+ Makefile.am | 4 +++-
+ Makefile.decl | 57 +++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 3 ++-
+ json-glib/Makefile.am | 9 ++++++-
+ json-glib/tests/Makefile.am | 15 ++++++++++++
+ json-glib/tests/node-test.c | 27 +++++++++++++++++++++
6 files changed, 112 insertions(+), 3 deletions(-)
commit d313aa1e9e472834252ec173c0409eba11ebcff9
Update gitignore
- .gitignore | 1 +
+ .gitignore | 1 +
1 file changed, 1 insertion(+)
commit 8a2bb3c4400b9df6cd864eb29920a7767e8170c7
Also, use the Slice allocator for the ScannerKey structs.
- json-glib/json-scanner.c | 42 ++++++++++++++++++++----------------------
+ json-glib/json-scanner.c | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
commit 42f7800c5b1c30ff187fc824a9bb39565033488e
JsonParser now uses JsonScanner, the internal copy of GScanner.
- json-glib/json-parser.c | 33 +++++++++++++++++----------------
+ json-glib/json-parser.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
commit 314f24fd0c8c6b024c93b1d8d275f9049ef22951
Rename all the API and the data types to the Json namespace, so we can
use the internal copy instead of GScanner.
- json-glib/json-scanner.c | 639 +++++++++++++++++++++++-----------------------
- json-glib/json-scanner.h | 6 +-
+ json-glib/json-scanner.c | 639 ++++++++++++++++++++++++-----------------------
+ json-glib/json-scanner.h | 6 +-
2 files changed, 328 insertions(+), 317 deletions(-)
commit 65708000ab02d0a4080b662bb409ac4b79101488
Add JsonScanner to the build
- json-glib/Makefile.am | 2 ++
+ json-glib/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit 8e27ac27a9b22361296564d740301c2c49b387f8
Do not require an ancient version of automake, and settle for one slightly
less ancient.
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit a475b0896d5760c893a099c9411f9790e5c492ba
Update the JsonScanner default configuration
- json-glib/json-scanner.c | 84 ++++++++++++++++++++--------------------------
+ json-glib/json-scanner.c | 84 +++++++++++++++++++++---------------------------
1 file changed, 36 insertions(+), 48 deletions(-)
commit 10ac1734b326700257ef318d9a2000c538b5cd38
Also, remove the configuration: JsonScanner will provide us with one.
- json-glib/json-parser.c | 127 ++++++++++++++++-------------------------------
+ json-glib/json-parser.c | 127 +++++++++++++++++-------------------------------
1 file changed, 44 insertions(+), 83 deletions(-)
commit 4a4095c360fc29f766e8baba3529a78b6d736b19
Add json-scanner.h to the exported headers
- json-glib/json-glib.h | 1 +
+ json-glib/json-glib.h | 1 +
1 file changed, 1 insertion(+)
commit 469a22e4f1fac6b4fd8110823322b7fbfa9b6552
Include JsonScanner into JsonParser
- json-glib/json-parser.c | 1 +
+ json-glib/json-parser.c | 1 +
1 file changed, 1 insertion(+)
commit 8537549a5a65f3111a4436b69499664c167b1534
The GTokenType extension enumeration belongs with the tokenizer.
- json-glib/json-parser.h | 15 ++-------------
+ json-glib/json-parser.h | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
commit 1ddd45d36a3a25aa86a95c60e0c29e83687971bd
JsonNode. Not going to happend in 0.6, but it's worth adding it to the
1.0 roadmap.
- contrib/json-glib-1.0.deps | 1 +
- contrib/json-glib-1.0.vapi | 14 +++++-----
- contrib/json-test.vala | 62 +++++++++++++++++++++-----------------------
+ contrib/json-glib-1.0.deps | 1 +
+ contrib/json-glib-1.0.vapi | 14 +++++------
+ contrib/json-test.vala | 62 ++++++++++++++++++++++------------------------
3 files changed, 38 insertions(+), 39 deletions(-)
commit e8a59f086f43e5abd5414033ea8c9a886eb112ed
Rules starting with '%' are a make-isms, and automake 1.10 complains a
lot about them.
- Makefile.am | 2 +-
+ Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b6963328f3d8d8e85ca0b21f9bdeca77b5611019
The json_parser_peek_root() function has been removed, and so we do not
its symbol in the json-glib-sections.txt file anymore.
- doc/reference/json-glib-sections.txt | 1 -
+ doc/reference/json-glib-sections.txt | 1 -
1 file changed, 1 deletion(-)
commit 48079c2f580171235eecc298b0193022a67e0b79
Do not free the root node returned by the get_root() method in the
JSON-GObject API and in the JsonParser tests.
- json-glib/json-gobject.c | 4 +---
- tests/test-01.c | 2 +-
- tests/test-02.c | 2 --
- tests/test-03.c | 2 --
+ json-glib/json-gobject.c | 4 +---
+ tests/test-01.c | 2 +-
+ tests/test-02.c | 2 --
+ tests/test-03.c | 2 --
4 files changed, 2 insertions(+), 8 deletions(-)
commit a86a300fdc256ad4270881cf9b7b97367cd87c87
This commit reverts the 0b6b09c0 commit, by removing the peek_root() method
and restoring the previous get_root() method behaviour.
- json-glib/json-parser.c | 26 ++------------------------
- json-glib/json-parser.h | 1 -
+ json-glib/json-parser.c | 26 ++------------------------
+ json-glib/json-parser.h | 1 -
2 files changed, 2 insertions(+), 25 deletions(-)
commit 9a167068edcde51b50a15bab4ee8623994eb9c04
The json_object_has_member() used the passed in member name, instead of
the correctly normalized one.
- json-glib/json-object.c | 2 +-
+ json-glib/json-object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f2f08d282ac6bc69ba9029d065979b1332abd5a5
and dispose methods. As further optimisation, inlining them should be
worth as well.
- json-glib/json-parser.c | 51 ++++++++++++++++++++++++++++-------------------
+ json-glib/json-parser.c | 51 +++++++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 21 deletions(-)
commit 629d4a54913c578d7b612f10d9b04addc8e0c7fb
Including the autotools generated config.h should always be conditional
on the HAVE_CONFIG_H definitions.
- json-glib/json-array.c | 2 ++
- json-glib/json-generator.c | 2 ++
- json-glib/json-gobject.c | 2 ++
- json-glib/json-node.c | 3 +++
- json-glib/json-object.c | 2 ++
+ json-glib/json-array.c | 2 ++
+ json-glib/json-generator.c | 2 ++
+ json-glib/json-gobject.c | 2 ++
+ json-glib/json-node.c | 3 +++
+ json-glib/json-object.c | 2 ++
5 files changed, 11 insertions(+)
commit e172e9ccec88999e7d8433df08d8d92568537cf7
Use an intermediary pointer to avoid a lot of pointer dereferences
- json-glib/json-parser.c | 25 ++++++++++++++-----------
+ json-glib/json-parser.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
commit 61a6a144a2182946be4fb975d05e1c26d814c323
Also, start binding the basic GObject API, even though no serializable
support is ready, yet.
- contrib/json-glib-1.0.vapi | 21 ++++++++++--
- contrib/json-object.vala | 10 ++++--
- contrib/json-test.vala | 81 ++++++++++++++++++++++++++++++++------------
+ contrib/json-glib-1.0.vapi | 21 ++++++++++--
+ contrib/json-object.vala | 10 ++++--
+ contrib/json-test.vala | 81 +++++++++++++++++++++++++++++++++-------------
3 files changed, 85 insertions(+), 27 deletions(-)
commit 8ec0c93715f6f43e4829a6f3ac534f9ec05e0363
methods, and still be able to retain some basic functionality for the methods
they decide not to implement.
- json-glib/json-gobject.c | 208 ++++++++++++++++++++++++++--------------------
+ json-glib/json-gobject.c | 208 +++++++++++++++++++++++++++--------------------
1 file changed, 120 insertions(+), 88 deletions(-)
commit 5bb6dd7b77dcd0d1996f484990223287d2144ff3
current state; this means clearing the variable_name string it saves when
the passed JSON stream is a JavaScript assignment.
- json-glib/json-parser.c | 2 ++
+ json-glib/json-parser.c | 2 ++
1 file changed, 2 insertions(+)
commit a90a842f269314c4423de9d84d03391a8efbd7b5
we implicitly always computed the buffer length and discarded the passed
length parameter.
- json-glib/json-parser.c | 10 +++++-----
- json-glib/json-parser.h | 2 +-
+ json-glib/json-parser.c | 10 +++++-----
+ json-glib/json-parser.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
commit 7229b9bf0bd15c6c1e5b695f8e291218a041ab45
Avoid feeding garbage to the callers by using g_slice_new0().
- json-glib/json-node.c | 9 +++++----
+ json-glib/json-node.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
commit ba7282dd23e2980203208cb73942535bfefa5906
Found this very dumb leak while using Valgrind.
- json-glib/json-generator.c | 6 ++++++
+ json-glib/json-generator.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 193aca9aabbfc3db8e1faca0a65b19ac7ba96341
copy inside GValue, and it's not ours to free, as Valgrind gently pointed
out.
- tests/test-07.c | 2 --
+ tests/test-07.c | 2 --
1 file changed, 2 deletions(-)
commit a6fae2d61b1cfefa742574761edc19c8d6f702f5
is too much C-oriented. This example shows how to serialize a class in
Vala to a JSON string.
- contrib/json-object.vala | 40 ++++++++++++++++++++++++++++++++++++++++
+ contrib/json-object.vala | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
commit ea6cc8756f70d488eae128e4a01f63ce2766cc3a
Omit the lenght argument now that we provide a default
- contrib/json-test.vala | 2 +-
+ contrib/json-test.vala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9492f3439dd491bb5afadfe6b2bd49a72ec9bb1e
* add the non-null value marker for strings
* provide default values for the length argument in from_data()/to_data()
- contrib/json-glib-1.0.vapi | 20 +++++++++++---------
+ contrib/json-glib-1.0.vapi | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
commit a255b4f5eb8769c444a9ac3a4cc7404fccd44ee3
contrib directory. This might change in the future, so we already
have the HAVE_VALA conditional for the Makefiles.
- Makefile.am | 8 +++++++-
- configure.ac | 3 +++
+ Makefile.am | 8 +++++++-
+ configure.ac | 3 +++
2 files changed, 10 insertions(+), 1 deletion(-)
commit aa8911ca4d63bfb3dd34997f9a745d70d12673af
Update the test case for the Vala bindings
- contrib/json-test.vala | 4 ++--
+ contrib/json-test.vala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 7083e9e6733611b5313f0708c4b93b9726ef26d0
Add the Json.Object.dup_member() and Json.Array.dup_element() functions.
Also, export the JSON_NODE_TYPE() macro as Json.Node.type() method.
- contrib/json-glib-1.0.vapi | 8 ++++++--
+ contrib/json-glib-1.0.vapi | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 9d4588e97a88960a4dd6a28debb3cb0f8d75f098
Add symbols of the newly committed API
- doc/reference/json-glib-sections.txt | 3 +++
+ doc/reference/json-glib-sections.txt | 3 +++
1 file changed, 3 insertions(+)
commit cf2eceeb69ccbda4f2ff583ee7869c7fd3cda603
binding the JSON-GLib API, because they can manage the lifetime of the
returned values using their own rules.
- json-glib/json-array.c | 29 +++++++++++++++++++++++++++++
- json-glib/json-object.c | 29 +++++++++++++++++++++++++++++
- json-glib/json-types.h | 4 ++++
+ json-glib/json-array.c | 29 +++++++++++++++++++++++++++++
+ json-glib/json-object.c | 29 +++++++++++++++++++++++++++++
+ json-glib/json-types.h | 4 ++++
3 files changed, 62 insertions(+)
commit 5a4a8761af0562fbee8e1a56ce1771a20c1ad8e3
Dispose the root node when using the JsonParser and JsonGenerator
objects after the change in sematics for their accessors.
- tests/test-01.c | 2 +-
- tests/test-02.c | 2 ++
- tests/test-03.c | 2 ++
- tests/test-04.c | 8 ++++++++
- tests/test-05.c | 6 ++++++
+ tests/test-01.c | 2 +-
+ tests/test-02.c | 2 ++
+ tests/test-03.c | 2 ++
+ tests/test-04.c | 8 ++++++++
+ tests/test-05.c | 6 ++++++
5 files changed, 19 insertions(+), 1 deletion(-)
commit ac699263493e09eeb203f9bf88c0a8296f9e4a8f
Update json_construct_gobject() to the change of behaviour in the
root node getter function of JsonParser.
- json-glib/json-gobject.c | 2 ++
+ json-glib/json-gobject.c | 2 ++
1 file changed, 2 insertions(+)
commit 0b6b09c0fe2fdd21b18593192e7213d1b0098f12
A function returning the pointer has also been added, and it's called
json_parser_peek_root().
- json-glib/json-parser.c | 26 ++++++++++++++++++++++++--
- json-glib/json-parser.h | 2 ++
+ json-glib/json-parser.c | 26 ++++++++++++++++++++++++--
+ json-glib/json-parser.h | 2 ++
2 files changed, 26 insertions(+), 2 deletions(-)
commit 5f110dc5ad338497c95418b9ad1b267c95fb8ded
Add bindings for the basic JSON-GLib API. GObject API will arrive later.
- Makefile.am | 2 +-
- configure.ac | 12 +++++
- contrib/Makefile.am | 4 ++
- contrib/json-glib-1.0.vapi | 118 ++++++++++++++++++++++++++++++++++++++++++++
- contrib/json-test.vala | 87 ++++++++++++++++++++++++++++++++
+ Makefile.am | 2 +-
+ configure.ac | 12 +++++
+ contrib/Makefile.am | 4 ++
+ contrib/json-glib-1.0.vapi | 118 +++++++++++++++++++++++++++++++++++++++++++++
+ contrib/json-test.vala | 87 +++++++++++++++++++++++++++++++++
5 files changed, 222 insertions(+), 1 deletion(-)
commit 557a60b4e0f1fd6fc0fa79efc60f9bfd777e0670
The indent character should be any Unicode character available instead
of a generic char.
- json-glib/json-generator.c | 16 ++++++++--------
- tests/test-05.c | 6 +++++-
+ json-glib/json-generator.c | 16 ++++++++--------
+ tests/test-05.c | 6 +++++-
2 files changed, 13 insertions(+), 9 deletions(-)
commit 5fc37f8f2a1594821623419f75ceaa4b95fe07cf
The JsonGenerator:indent-char can be used to control the character that
indents the lines when pretty printing.
- json-glib/json-generator.c | 54 ++++++++++++++++++++++++++++++++------------
+ json-glib/json-generator.c | 54 ++++++++++++++++++++++++++++++++++------------
1 file changed, 40 insertions(+), 14 deletions(-)
commit 58133b51152ca76b8cb5c93b5991f9b1a565e9a9
JsonNode of type value for floating point numbers is G_TYPE_DOUBLE
and not G_TYPE_FLOAT anymore.
- json-glib/json-generator.c | 4 ++--
+ json-glib/json-generator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 80006db7bcea2bd8c44a648a64ba3da6a05a6fd1
Update the GObject deserialization test suite to check for the correct
deserialization of the enum/flags values.
- tests/test-08.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-------
+ tests/test-08.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 53 insertions(+), 7 deletions(-)
commit 1110e098fa879abf7f67f24af2a1b736ce359dd6
This code is taken from ClutterScript and it was adapted from GtkBuilder.
- json-glib/json-gobject.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-gobject.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 170 insertions(+)
commit 2674ce68e574cebeca147944cf748b41fbe27507
Bump up to 0.5.0
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c1547eb3aba6f09b3ce4c23bd66a798e03b35a34
Bump up to 0.4.0
- NEWS | 9 +++++++++
- configure.ac | 2 +-
+ NEWS | 9 +++++++++
+ configure.ac | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
commit 03325e108e40d5deba979852ee402d7d6579ac81
Fix variable shadowing for distcheck
- json-glib/json-parser.c | 4 ++--
+ json-glib/json-parser.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit afeec9b40468d289351c78007b5122ff716bb977
Add 0.4 symbols index
- doc/reference/json-glib-docs.sgml | 4 ++++
+ doc/reference/json-glib-docs.sgml | 4 ++++
1 file changed, 4 insertions(+)
commit 32023e03ca9c976e66b9af949d4aea36e1d4d874
We provide fallbacks in case a JsonSerializable object does not translate
a property into a JSON object member and vice versa.
- json-glib/json-gobject.c | 15 ++++++++-------
+ json-glib/json-gobject.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
commit c669a28d37795be68f3a51e9353f6f9d8e695a52
Add new symbols to the documentation
- doc/reference/json-glib-sections.txt | 7 ++++++-
+ doc/reference/json-glib-sections.txt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit b83a2bfa96885837ca48bacb6492fd68a2b5b564
we will fall back to the simple value-to-node generator we provide for
non-serializable classes.
- json-glib/json-gobject.c | 17 +++++++++++------
- tests/test-07.c | 13 +------------
+ json-glib/json-gobject.c | 17 +++++++++++------
+ tests/test-07.c | 13 +------------
2 files changed, 12 insertions(+), 18 deletions(-)
commit 10e937a68bd802a4f5948d900aa2201344cfc138
Add test unit for the GObject deserialization
- .gitignore | 2 +
- tests/Makefile.am | 4 +-
- tests/test-08.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ .gitignore | 2 +
+ tests/Makefile.am | 4 +-
+ tests/test-08.c | 291 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 296 insertions(+), 1 deletion(-)
commit 7b93db7ad996b29a6c576db33803029dc94e16fc
to copy the value from the JSON node into the target GValue, not the other
way around.
- json-glib/json-gobject.c | 6 ++++--
+ json-glib/json-gobject.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 9e61004365982017bfe9b76889e2a7d1a0320350
Update git ignore file
- .gitignore | 2 ++
+ .gitignore | 2 ++
1 file changed, 2 insertions(+)
commit 4b496c7d906c81dceafe6a5f442b55b6e161f762
It will natively convert integers, booleans, strings and double precision
floating point values; it also handles string vectors in form of arrays.
- json-glib/json-gobject.c | 94 +++++++++++++++++++++++++++++++++++++++++-----
+ json-glib/json-gobject.c | 94 +++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 85 insertions(+), 9 deletions(-)
commit a7c39c910e08093ee0d0723685005623f26b9eae
clearly states what happens, and that you can safely free the node after
feeding it to the JsonGenerator.
- json-glib/json-generator.c | 30 ++++++++++++++++++++++++++++--
+ json-glib/json-generator.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
commit 6132d7325c33e26740b4c955d8ccbe53fd817cd8
JsonNode payload is inside a union.
- json-glib/json-node.c | 2 +-
+ json-glib/json-node.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f051b948714e4928a7d7f903e891639ce4ba82fd
marshallers to a GObject class. We could use pointers, but we'd loose type
safety, so it's a no-no.
- json-glib/json-node.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- json-glib/json-types.h | 8 ++++++--
+ json-glib/json-node.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-types.h | 8 ++++++--
2 files changed, 54 insertions(+), 2 deletions(-)
commit 1f9b3e50282f8aa4a421c83ad596f6186ef82ec9
perfectly simple and elegant notation into something that allows lazyness
and breakage.
- json-glib/json-parser.c | 12 +++++++++++-
- tests/test-02.c | 1 +
+ json-glib/json-parser.c | 12 +++++++++++-
+ tests/test-02.c | 1 +
2 files changed, 12 insertions(+), 1 deletion(-)
commit 261d05a4cdcc1f64824615cdc81b4b467d0a5f57
The function json_parser_has_assignment() can be used to query both the
presence of an assignment and the variable name at the same time.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-parser.c | 80 +++++++++++++++++++++++++++++++++-
- json-glib/json-parser.h | 5 +++
- tests/test-02.c | 5 +++
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-parser.c | 80 +++++++++++++++++++++++++++++++++++-
+ json-glib/json-parser.h | 5 +++
+ tests/test-02.c | 5 +++
4 files changed, 89 insertions(+), 2 deletions(-)
commit 45c697263364a975fd6a54373f999f2932436b6f
This is the initial implementation of the function: the JsonNode-to-GValue
fallback parser is just a stub.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-gobject.c | 182 +++++++++++++++++++++++++++++++---
- json-glib/json-gobject.h | 8 +-
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-gobject.c | 182 ++++++++++++++++++++++++++++++++---
+ json-glib/json-gobject.h | 8 +-
3 files changed, 177 insertions(+), 14 deletions(-)
commit 4eade1089355ebcf0614d0cfbc9c441513b7d97a
Fix objects test suite to match the arrays one
- tests/test-03.c | 8 ++++----
+ tests/test-03.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 3948d83795d68d665b8b969c08b6c40498eb2661
Add a check for commas after complex data types inside object members.
- json-glib/json-parser.c | 8 +++++++-
+ json-glib/json-parser.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 6182457fa305a1f159e9009d3fbef42a93f2768e
Fix a typo in test number 7 (missing comma to separate the C strings) and
use G_TYPE_DOUBLE instead of G_TYPE_FLOAT for the floating point values.
- tests/test-02.c | 8 ++++----
+ tests/test-02.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 25cdc18be8acdad54561f919c5805ad4fa9b3ac9
Catch missing commas after an array element or an object member.
- json-glib/json-parser.c | 10 ++++++++++
+ json-glib/json-parser.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 812422e4ed4df83374cdda6d94637448ab94dfef
which should make the JsonParser hopefully complete.
- json-glib/json-parser.c | 123 +++++++++++++++++++++++++++++++++++++++--------
+ json-glib/json-parser.c | 123 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 103 insertions(+), 20 deletions(-)
commit 72d007d865a822875dfa311698fb2d13f5d3df69
Before calling json_object_unref() or json_array_unref() in json_node_free()
we need to check if the payload of JsonNode is set to avoid a critical.
- json-glib/json-node.c | 6 ++++--
+ json-glib/json-node.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 59a66484befba457eda2ee7a9540f2b33ff04031
This should have been done before relasing 0.2.0. Well, that's what
point releases are for.
- tests/Makefile.am | 4 +-
- tests/test-07.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am | 4 +-
+ tests/test-07.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 268 insertions(+), 1 deletion(-)
commit 34515af7bb1d69317b9e52d0ced92beaf6770e7d
A placeholder, while syntactically correct, won't do.
- json-glib/json-gobject.c | 6 ++++++
+ json-glib/json-gobject.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 0656c4bee8e14c375481c89a62f0e6e95be758ce
This is what happens when you fix a compiler warning about a shadowing
variable and you don't run the test suite to check the results.
- json-glib/json-generator.c | 10 ++++++----
+ json-glib/json-generator.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
commit 88794df33e08cb409f71d1aaf702cd509b600954
Bump up to 0.3.0
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0ce3bf30d84aedcf5f8f75e6c1112d91dcc1d654
Bump up to 0.2.0
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 77248800533f3dabfb09dfa8ba32e3084ea62d5f
Fix DISTCHECK configure flags
- Makefile.am | 2 +-
+ Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 70be36c97a8cd598af061eb9ac5a9a5852858682
Fix compilation errors with extra maintainer CFLAGS
- json-glib/json-array.c | 2 +-
- json-glib/json-generator.c | 16 ++++++++--------
- json-glib/json-parser.c | 4 ++--
+ json-glib/json-array.c | 2 +-
+ json-glib/json-generator.c | 16 ++++++++--------
+ json-glib/json-parser.c | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
commit 57c39582818b8a6579fed327f5c6e2fc34e93694
Some autogenerated code caused -Werror to croak, so -Wextra has to go.
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9c690da734ee4513f19841f93a08ae35bbaa65b1
Autogenerate the ChangeLog when disting
- Makefile.am | 5 +++++
+ Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
commit 95fc9c4fb5af82c766d2f4f515b361028bc348e7
Fix EXTRA_DIST files for distcheck
- json-glib/Makefile.am | 16 +++++++++-------
+ json-glib/Makefile.am | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
commit 87a36b8a5e23f3cf80730627f9b89061934a5bbf
to control the (de)serialization of GObject properties. This way it's
possible to serialize GObjects with properties holding complex data types.
- doc/reference/json-glib-sections.txt | 15 +++
- json-glib/json-gobject.c | 188 ++++++++++++++++++++++++++++------
- json-glib/json-gobject.h | 51 +++++++++
- json-glib/json-types.h | 1 +
+ doc/reference/json-glib-sections.txt | 15 +++
+ json-glib/json-gobject.c | 188 +++++++++++++++++++++++++++++------
+ json-glib/json-gobject.h | 51 ++++++++++
+ json-glib/json-types.h | 1 +
4 files changed, 224 insertions(+), 31 deletions(-)
commit 85cb0f44c4c7297a75141999674f3eb0fdf6a308
To map json_array_get_elements(), a json_object_get_values() method has
been added which returns the list of JsonNodes contained by a JsonObject.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-object.c | 41 ++++++++++++++++++++++++++++++++++
- json-glib/json-types.h | 1 +
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-object.c | 41 ++++++++++++++++++++++++++++++++++++
+ json-glib/json-types.h | 1 +
3 files changed, 43 insertions(+)
commit 474ecf1cc6aae35b184edffc75fc8626c3f12f61
Add a note in the JsonObject documentation for the member name normalization
- json-glib/json-object.c | 6 +++++-
+ json-glib/json-object.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 93e26b94d9bb1909f3b16a4b0500f27660d7e621
This means that "member-name" and "member_name" are completely equivalent
for a JsonObject.
- json-glib/json-object.c | 31 ++++++++++++++++++++++++++-----
+ json-glib/json-object.c | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
commit 73a7671dedfd3bb9bc1a8c197a68dcef90e627f7
the members from a JsonObject, we can provide an internal version of that
function and hideit behind a pre-processor macro.
- configure.ac | 2 +-
- json-glib/json-object.c | 25 +++++++++++++++++++++++++
+ configure.ac | 2 +-
+ json-glib/json-object.c | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
commit 28928a2f1cbe83a2f1bf699c915daa6eca80f587
respectively. This way, the JsonObject and JsonArray are API-complete and
the object model can be manipulated in code.
- doc/reference/json-glib-sections.txt | 2 +
- json-glib/json-array.c | 18 +++++
- json-glib/json-object.c | 17 +++++
- json-glib/json-types.h | 126 ++++++++++++++++++----------------
+ doc/reference/json-glib-sections.txt | 2 +
+ json-glib/json-array.c | 18 +++++
+ json-glib/json-object.c | 17 +++++
+ json-glib/json-types.h | 126 ++++++++++++++++++-----------------
4 files changed, 102 insertions(+), 61 deletions(-)
commit b3ecd6e2fbdd58250427f406c43d60b8cb8d2644
Also, use the commodity JsonNode API to avoid using values in the parser
code.
- json-glib/json-parser.c | 79 +++++++++++++++++------------------------------
+ json-glib/json-parser.c | 79 ++++++++++++++++++-------------------------------
1 file changed, 29 insertions(+), 50 deletions(-)
commit a7839a06da53d32eb372b4813e5883a04e1c36b7
Add the forgotten JsonGenerator type function
- doc/reference/json-glib.types | 1 +
+ doc/reference/json-glib.types | 1 +
1 file changed, 1 insertion(+)
commit daeef3345c3a7f3325cea8c945f0e1d814defcc1
The newly added json_node_dup_string() is a convenience function for
getting a copy of the string contained inside a JsonNode.
- doc/reference/json-glib-sections.txt | 1 +
- json-glib/json-node.c | 20 ++++++++++++++++++++
- json-glib/json-types.h | 1 +
+ doc/reference/json-glib-sections.txt | 1 +
+ json-glib/json-node.c | 20 ++++++++++++++++++++
+ json-glib/json-types.h | 1 +
3 files changed, 22 insertions(+)
commit b12efcec57fff6e7637fc924fc50333b97eb2594
When adding a JsonNode to a JsonObject or a JsonArray, the containers
take ownership of the node.
- json-glib/json-array.c | 7 +++++--
- json-glib/json-object.c | 13 ++++++++-----
+ json-glib/json-array.c | 7 +++++--
+ json-glib/json-object.c | 13 ++++++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
commit bd5a60ca658257752993ccea47950b97cdc45246
getting fundamental types in and from a JsonNode, to avoid
jumping through all the GValue hoops.
- doc/reference/json-glib-sections.txt | 8 ++
- json-glib/json-node.c | 201 ++++++++++++++++++++++++++++++++++
- json-glib/json-types.h | 12 ++
+ doc/reference/json-glib-sections.txt | 8 ++
+ json-glib/json-node.c | 201 +++++++++++++++++++++++++++++++++++
+ json-glib/json-types.h | 12 +++
3 files changed, 221 insertions(+)
commit ad95c8bf8e4103058d42ae71f47e6980e3b52c34
uses doubles. Hence, we need to use G_TYPE_DOUBLE when saving the
parsed constants into a GValue.
- json-glib/json-parser.c | 8 ++++----
+ json-glib/json-parser.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 220838e4e61c5a8fd9cf627da7309acf44fa82f0
and position within that line. These methods works only while parsing,
so within the signal handlers and inside subclasses.
- doc/reference/json-glib-sections.txt | 6 +++++
- json-glib/json-parser.c | 46 +++++++++++++++++++++++++++++++---
- json-glib/json-parser.h | 21 +++++++++-------
+ doc/reference/json-glib-sections.txt | 6 +++++
+ json-glib/json-parser.c | 46 +++++++++++++++++++++++++++++++++---
+ json-glib/json-parser.h | 21 +++++++++-------
3 files changed, 61 insertions(+), 12 deletions(-)
commit ea5ee264a5b82fd1d09fa84ec81e17c4ea0d0c4a
Document the newly added signals
- json-glib/json-parser.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++
- json-glib/json-parser.h | 10 +++++++-
+ json-glib/json-parser.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-parser.h | 10 +++++++-
2 files changed, 73 insertions(+), 1 deletion(-)
commit fa9d1676da588306be5a14bcab100ad58a41b799
completion of every member and element of a JsonObject and a JsonArray.
These signals require the addition of some custom marshaller.
- json-glib/json-marshal.list | 4 ++
- json-glib/json-parser.c | 118 +++++++++++++++++++++++++++++++++++++++++--
- json-glib/json-parser.h | 25 +++++++--
+ json-glib/json-marshal.list | 4 ++
+ json-glib/json-parser.c | 118 ++++++++++++++++++++++++++++++++++++++++++--
+ json-glib/json-parser.h | 25 ++++++++--
3 files changed, 141 insertions(+), 6 deletions(-)
commit aa2b31234f7cfac63b870e8d9d74e682b3121d4a
be GObjects (no signals, no inheritance and their implementation must be
completely opaque for the developer).
- json-glib/json-array.c | 13 +++++++++++++
- json-glib/json-object.c | 13 +++++++++++++
- json-glib/json-types.h | 4 ++--
+ json-glib/json-array.c | 13 +++++++++++++
+ json-glib/json-object.c | 13 +++++++++++++
+ json-glib/json-types.h | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
commit bd41854505f47d2176ea4cfba8083ce998c482cc
Document the GObject integration API into the API reference
- doc/reference/json-glib-docs.sgml | 6 ++++++
- doc/reference/json-glib-sections.txt | 6 ++++++
+ doc/reference/json-glib-docs.sgml | 6 ++++++
+ doc/reference/json-glib-sections.txt | 6 ++++++
2 files changed, 12 insertions(+)
commit cea3f69f2cde1cb4e6ea9242f6014b31864ad80f
Add test case for GObject integration
- .gitignore | 2 +
- tests/Makefile.am | 4 +-
- tests/test-06.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ .gitignore | 2 +
+ tests/Makefile.am | 4 +-
+ tests/test-06.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 159 insertions(+), 1 deletion(-)
commit 3666613e47b66d67a28bc06c6dcf678fe97eae50
This commit adds json-gobject.h and json_serialize_gobject() to
JSON-GLib, to serialize a GObject instance into a JSON data stream.
- .gitignore | 1 +
- json-glib/Makefile.am | 2 +
- json-glib/json-gobject.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++
- json-glib/json-gobject.h | 33 +++++++++
+ .gitignore | 1 +
+ json-glib/Makefile.am | 2 +
+ json-glib/json-gobject.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-gobject.h | 33 +++++++++
4 files changed, 205 insertions(+)
commit 8398253c76cf5dda23891b49b1aaa49e57d95a8d
The complex object generation is taken from the RFC 4627, Examples
section.
- .gitignore | 2 +
- tests/Makefile.am | 4 +-
- tests/test-05.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ .gitignore | 2 +
+ tests/Makefile.am | 4 +-
+ tests/test-05.c | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 222 insertions(+), 1 deletion(-)
commit 2b25dbfa802f9af6e76fbe72140b687535cae8e5
JsonGenerator can now create objects and array-nested objects, with and without
pretty printing. The test suite has been updated accordingly.
- json-glib/json-generator.c | 125 ++++++++++++++++++++++++++++++++++++++++++--
- tests/test-04.c | 68 ++++++++++++++++++++++++
+ json-glib/json-generator.c | 125 +++++++++++++++++++++++++++++++++++++++++++--
+ tests/test-04.c | 68 ++++++++++++++++++++++++
2 files changed, 190 insertions(+), 3 deletions(-)
commit 326cdead6f1c7b1bbaae0961d28bfe5ca3af0a1a
JsonGenerator now supports nested arrays, both with and without pretty
printing. The tests suite has been updated accordingly.
- json-glib/json-generator.c | 10 ++++++++
- tests/test-04.c | 61 ++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-generator.c | 10 ++++++++
+ tests/test-04.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+)
commit 6f4dd6b154a150e8b4221800b61f85e5c4277d1b
The test unit has been updated to exercise this new feature.
- json-glib/json-generator.c | 160 ++++++++++++++++++++++++++++++++++++++++++--
- tests/test-04.c | 86 ++++++++++++++++++++++--
+ json-glib/json-generator.c | 160 +++++++++++++++++++++++++++++++++++++++++++--
+ tests/test-04.c | 86 ++++++++++++++++++++++--
2 files changed, 234 insertions(+), 12 deletions(-)
commit 7f0232eaab0af434e2e086c83b68395146e410f9
Update list of git ignored files
- .gitignore | 5 +++++
+ .gitignore | 5 +++++
1 file changed, 5 insertions(+)
commit 47b34271f989cb5f2ba01a633d003adb6052cbd1
Add initial test unit for the JsonGenerator object
- tests/Makefile.am | 4 +++-
- tests/test-04.c | 29 +++++++++++++++++++++++++++++
+ tests/Makefile.am | 4 +++-
+ tests/test-04.c | 29 +++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
commit 8edb4ef3232428ac9e548ae6c1dfa2328bf7198c
Add missing json-generator.h header
- json-glib/json-glib.h | 1 +
+ json-glib/json-glib.h | 1 +
1 file changed, 1 insertion(+)
commit f09acae8e0d6ceba5d13de75551491835a7e71de
Now that we moved the constructors and setters for the JSON data types into
the public symbols we need to document them to get back to 100% doc coverage.
- doc/reference/json-glib-sections.txt | 26 +++++++++++-
- json-glib/json-array.c | 22 ++++++++++
- json-glib/json-node.c | 78 ++++++++++++++++++++++++++++++++++
- json-glib/json-object.c | 15 +++++++
- json-glib/json-types.h | 2 +
+ doc/reference/json-glib-sections.txt | 26 +++++++++++-
+ json-glib/json-array.c | 22 ++++++++++
+ json-glib/json-node.c | 78 ++++++++++++++++++++++++++++++++++++
+ json-glib/json-object.c | 15 +++++++
+ json-glib/json-types.h | 2 +
5 files changed, 141 insertions(+), 2 deletions(-)
commit 228a5e4efe65995778847f48d2be43f3df988e10
also means that the json-private.h header is now useless, so we can
remove it from the build and repository.
- json-glib/Makefile.am | 2 +-
- json-glib/json-array.c | 1 -
- json-glib/json-generator.c | 1 -
- json-glib/json-node.c | 1 -
- json-glib/json-object.c | 1 -
- json-glib/json-parser.c | 1 -
- json-glib/json-private.h | 35 -----------------------------------
- json-glib/json-types.h | 38 +++++++++++++++++++++++++++++++-------
+ json-glib/Makefile.am | 2 +-
+ json-glib/json-array.c | 1 -
+ json-glib/json-generator.c | 1 -
+ json-glib/json-node.c | 1 -
+ json-glib/json-object.c | 1 -
+ json-glib/json-parser.c | 1 -
+ json-glib/json-private.h | 35 -----------------------------------
+ json-glib/json-types.h | 38 +++++++++++++++++++++++++++++++-------
8 files changed, 32 insertions(+), 48 deletions(-)
commit bfa60e9ef9da71e3c0d171f81cd08e8eac749061
model tree. This commit adds the JsonGenerator class to the build and
API reference.
- doc/reference/json-glib-docs.sgml | 1 +
- doc/reference/json-glib-sections.txt | 25 ++++
- json-glib/Makefile.am | 2 +
- json-glib/json-generator.c | 255 ++++++++++++++++++++++++++++++++++
- json-glib/json-generator.h | 82 +++++++++++
+ doc/reference/json-glib-docs.sgml | 1 +
+ doc/reference/json-glib-sections.txt | 25 ++++
+ json-glib/Makefile.am | 2 +
+ json-glib/json-generator.c | 255 +++++++++++++++++++++++++++++++++++
+ json-glib/json-generator.h | 82 +++++++++++
5 files changed, 365 insertions(+)
commit 41849494890f1f51bc7c4429f0ee7b5d168da302
Fix ids inside the main documentation index
- doc/reference/json-glib-docs.sgml | 4 ++--
+ doc/reference/json-glib-docs.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit c3f8ea960ef7f8733969d9fb0f71531bc7449a16
With this commit, we reach 100% coverage.
- json-glib/json-parser.h | 19 +++++++++++++++++++
- json-glib/json-types.h | 20 ++++++++++++++++++++
+ json-glib/json-parser.h | 19 +++++++++++++++++++
+ json-glib/json-types.h | 20 ++++++++++++++++++++
2 files changed, 39 insertions(+)
commit 2211e4e60b90b92d868c9b5f6b61e133d2435b4d
It seems that the parent accessor fell through. This commit implements
the declared json_node_get_parent() function.
- json-glib/json-node.c | 16 ++++++++++++++++
+ json-glib/json-node.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
commit 29feafc236f888021b817fdfe0cfe685f5e3b65e
Add licensing informations to the source code
- json-glib/json-array.c | 29 ++++++++++++++++++++++++
- json-glib/json-node.c | 52 ++++++++++++++++++++++++++++++++++++-------
- json-glib/json-object.c | 34 ++++++++++++++++++++++++----
- json-glib/json-parser.c | 28 +++++++++++++++++++++--
- json-glib/json-parser.h | 19 ++++++++++++++++
- json-glib/json-types.h | 35 +++++++++++++++++++++++++++++
- json-glib/json-version.h.in | 19 ++++++++++++++++
+ json-glib/json-array.c | 29 +++++++++++++++++++++++++
+ json-glib/json-node.c | 52 ++++++++++++++++++++++++++++++++++++++-------
+ json-glib/json-object.c | 34 +++++++++++++++++++++++++----
+ json-glib/json-parser.c | 28 ++++++++++++++++++++++--
+ json-glib/json-parser.h | 19 +++++++++++++++++
+ json-glib/json-types.h | 35 ++++++++++++++++++++++++++++++
+ json-glib/json-version.h.in | 19 +++++++++++++++++
7 files changed, 202 insertions(+), 14 deletions(-)
commit 6eb1a5e94957d3555e7de5f6744a8777cd89efaf
Fix a stray newline in the documentation
- doc/reference/json-glib-docs.sgml | 3 +--
+ doc/reference/json-glib-docs.sgml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit a5ecf553082816a1ce6c4354ff23e8addf8d9c80
Update git ignore file
- .gitignore | 22 ++++++++++++++++++++++
+ .gitignore | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
commit 9bdee4c01adef7e9d7ed18d5dd94671057f1459b
Use gtk-doc to build the various bits and pieces of the API reference
for JSON-GLib.
- doc/Makefile.am | 1 +
- doc/reference/Makefile.am | 2 +-
- doc/reference/json-glib-docs.sgml | 153 ++++++++++++++++++++++++++++++++++
- doc/reference/json-glib-sections.txt | 92 ++++++++++++++++++++
- doc/reference/json-glib.types | 1 +
- json-glib/json-node.c | 2 +-
- json-glib/json-version.h.in | 8 ++
+ doc/Makefile.am | 1 +
+ doc/reference/Makefile.am | 2 +-
+ doc/reference/json-glib-docs.sgml | 153 +++++++++++++++++++++++++++++++++++
+ doc/reference/json-glib-sections.txt | 92 +++++++++++++++++++++
+ doc/reference/json-glib.types | 1 +
+ json-glib/json-node.c | 2 +-
+ json-glib/json-version.h.in | 8 ++
7 files changed, 257 insertions(+), 2 deletions(-)
commit 2e362edd46f11f2fd1fa327877372b902b70c280
Add more test cases for the object parsing
- tests/test-03.c | 3 +++
+ tests/test-03.c | 3 +++
1 file changed, 3 insertions(+)
commit 79423943a8588a8ed6d5bedbc038255111897261
The comma is used as a member and element separator, so it should be
swallowed by the parser as soon as possible.
- json-glib/json-parser.c | 25 ++++++++++++++++---------
+ json-glib/json-parser.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
commit e711b883dba88d68b6986d87f14a06361cf54be7
Update gitignore
- .gitignore | 3 +++
+ .gitignore | 3 +++
1 file changed, 3 insertions(+)
commit 591989c80b16fe68bdd79bcc7759a4249fdaf129
Add JSON object parsing testing to the test units.
- tests/Makefile.am | 8 +-
- tests/test-02.c | 73 +++++++++++++++++-
- tests/test-03.c | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am | 8 ++-
+ tests/test-02.c | 73 +++++++++++++++++--
+ tests/test-03.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 285 insertions(+), 7 deletions(-)
commit ba3a6e6afed0d4fe3853b8e7400516557a20f775
parse JSON objects, either alone or inside arrays. JsonParser is now
a JSON parser.
- json-glib/json-parser.c | 235 ++++++++++++++++++++++++++++++++++++++++++++---
+ json-glib/json-parser.c | 235 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 220 insertions(+), 15 deletions(-)
commit fd89ad3d7127e68df06345fa52863e73ada93689
extra complexity of unreffing the newly created complex containers after
setting them into the JsonNodes.
- json-glib/json-private.h | 4 ++++
+ json-glib/json-private.h | 4 ++++
1 file changed, 4 insertions(+)
commit b2ee98f9b0baac019540020e177189b6a3780b83
When parsing a JSON node we need to correctly set up the parent node
of the newly created ones.
- json-glib/json-parser.c | 6 +++++-
+ json-glib/json-parser.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 88b11be5eec1da769328e93189bc2f3316c9cd0a
The API has been updated and the tests now recurse through the generated
data model tree.
- json-glib/Makefile.am | 2 +-
- json-glib/json-array.c | 64 +++++------
- json-glib/json-data.c | 93 ----------------
- json-glib/json-node.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++
- json-glib/json-object.c | 44 +++-----
- json-glib/json-parser.c | 87 +++++++++++----
- json-glib/json-parser.h | 2 +-
- json-glib/json-private.h | 38 ++++---
- json-glib/json-types.h | 59 +++++-----
- tests/test-01.c | 2 +-
- tests/test-02.c | 112 ++++++++++++++++++-
+ json-glib/Makefile.am | 2 +-
+ json-glib/json-array.c | 64 +++++------
+ json-glib/json-data.c | 93 ----------------
+ json-glib/json-node.c | 269 +++++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-object.c | 44 +++-----
+ json-glib/json-parser.c | 87 +++++++++++----
+ json-glib/json-parser.h | 2 +-
+ json-glib/json-private.h | 38 ++++---
+ json-glib/json-types.h | 59 ++++++-----
+ tests/test-01.c | 2 +-
+ tests/test-02.c | 112 +++++++++++++++++++-
11 files changed, 535 insertions(+), 237 deletions(-)
commit c11ebd32f73a1e21d6097bf9eba8e12f7e35497a
know the type of the objects returned by the parser and by the other
object walking functions.
- json-glib/Makefile.am | 1 +
- json-glib/json-data.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++
- json-glib/json-private.h | 7 ++++
- json-glib/json-types.h | 53 ++++++++++++++++++--------
+ json-glib/Makefile.am | 1 +
+ json-glib/json-data.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++
+ json-glib/json-private.h | 7 ++++
+ json-glib/json-types.h | 53 ++++++++++++++++++---------
4 files changed, 138 insertions(+), 16 deletions(-)
commit f661c7e1a04c2fb198279030c9dd812f357240a3
eat anyway, there's no point in going through the switch() check
after we have finished parsing a nested array.
- json-glib/json-parser.c | 2 ++
+ json-glib/json-parser.c | 2 ++
1 file changed, 2 insertions(+)
commit ae3a66e6a90b6cfd71cb8c41c0d752fd1b0a67cc
Update gitignore file
- .gitignore | 7 +++++++
+ .gitignore | 7 +++++++
1 file changed, 7 insertions(+)
commit 7875c5f573fdc6c2a39e958d2032f4c26d1f91ff
a run-tests script later on and a pre-commit hook to invoke it
and catch regressions automagically.
- tests/Makefile.am | 12 ++++++++++++
- tests/test-01.c | 31 +++++++++++++++++++++++++++++++
- tests/test-02.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am | 12 ++++++++++++
+ tests/test-01.c | 31 +++++++++++++++++++++++++++++++
+ tests/test-02.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)
commit 81ad2e5c61db2391d2d98a6b5df1247e3abf16ec
of the parser object, though, so this can be considered a first raw
pass at the problem.
- json-glib/json-parser.c | 114 ++++++++++++++++++++++++++++++++++++++++-------
+ json-glib/json-parser.c | 114 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 97 insertions(+), 17 deletions(-)
commit b433703db6722785e33f968830e23c5806230ac2
Add RFC 4627 text, where JSON is defined
- doc/rfc4627.txt | 563 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ doc/rfc4627.txt | 563 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 563 insertions(+)
commit c77af0ec13e3e11cdb784510e6a75125bb8ef667
JSON is an object serialisation format (thanks, RFC4627), so it can
only express objects and/or arrays as top-levels.
- json-glib/json-parser.c | 24 ++++++++++++++----------
+ json-glib/json-parser.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
commit 0ff67fb63c5e021b88d6a3d17c5e34dc95ac2676
Update gitignore file
- .gitignore | 4 ++++
+ .gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit d98d8c3d245192abe6ec5a531c9d0d678b07d061
GScanner should really get a way to retrieve the last error message.
- json-glib/json-parser.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++-
- json-glib/json-parser.h | 28 ++++-
+ json-glib/json-parser.c | 266 +++++++++++++++++++++++++++++++++++++++++++++++-
+ json-glib/json-parser.h | 28 ++++-
2 files changed, 290 insertions(+), 4 deletions(-)
commit cd1040e2fb6f6da50aaf72017746b33234c39704
Use glib-genmarshal to generate the marshallers we need. For the
time being, we just need a (void,pointer).
- json-glib/Makefile.am | 30 +++++++++++++++++++++++++-----
- json-glib/json-marshal.list | 1 +
+ json-glib/Makefile.am | 30 +++++++++++++++++++++++++-----
+ json-glib/json-marshal.list | 1 +
2 files changed, 26 insertions(+), 5 deletions(-)
commit 821ac3e602f936318f9a2c3b831f135408ca5d74
Add gitignore file
- .gitignore | 29 +++++++++++++++++++++++++++++
+ .gitignore | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
commit c5bfb22f964b8f1feecdc8fb29d8a74b36861d32
JSON is the JavaScript Object Notation, and it's used to define objects
and object hierarchies in a human-readable way.
- AUTHORS | 1 +
- COPYING | 504 ++++++++++++++++++++++++++++++++++++++++++
- ChangeLog | 6 +
- Makefile.am | 15 ++
- README | 39 ++++
- autogen.sh | 4 +
- configure.ac | 119 ++++++++++
- doc/reference/Makefile.am | 82 +++++++
- doc/reference/version.xml.in | 1 +
- json-glib.pc.in | 11 +
- json-glib/Makefile.am | 52 +++++
- json-glib/json-array.c | 176 +++++++++++++++
- json-glib/json-glib.h | 8 +
- json-glib/json-object.c | 201 +++++++++++++++++
- json-glib/json-parser.c | 152 +++++++++++++
- json-glib/json-parser.h | 57 +++++
- json-glib/json-private.h | 26 +++
- json-glib/json-types.h | 32 +++
- json-glib/json-version.h.in | 65 ++++++
- 19 files changed, 1551 insertions(+)
+ AUTHORS | 1 +
+ COPYING | 504 ++++++++++++++++++++++++++++++++++++++
+ ChangeLog | 6 +
+ Makefile.am | 15 ++
+ NEWS | 0
+ README | 39 +++
+ autogen.sh | 4 +
+ configure.ac | 119 +++++++++
+ doc/Makefile.am | 0
+ doc/reference/Makefile.am | 82 +++++++
+ doc/reference/json-glib-docs.sgml | 0
+ doc/reference/version.xml.in | 1 +
+ json-glib.pc.in | 11 +
+ json-glib/Makefile.am | 52 ++++
+ json-glib/json-array.c | 176 +++++++++++++
+ json-glib/json-glib.h | 8 +
+ json-glib/json-object.c | 201 +++++++++++++++
+ json-glib/json-parser.c | 152 ++++++++++++
+ json-glib/json-parser.h | 57 +++++
+ json-glib/json-private.h | 26 ++
+ json-glib/json-types.h | 32 +++
+ json-glib/json-version.h.in | 65 +++++
+ tests/Makefile.am | 0
+ 23 files changed, 1551 insertions(+)
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
# custom rules for quiet builds
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/json-glib.pc.in \
- $(top_srcdir)/build/autotools/Makefile.am.gtest \
+DIST_COMMON = $(top_srcdir)/build/autotools/Makefile.am.gtest \
$(top_srcdir)/build/autotools/Makefile.am.silent \
- $(top_srcdir)/configure ABOUT-NLS COPYING NEWS
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(srcdir)/json-glib.pc.in ABOUT-NLS \
+ COPYING NEWS $(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
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = json-glib.pc
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_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 =
-RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive
+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
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
DATA = $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_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
+# 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
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
reldir="$$dir2"
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-rm -f libtool config.lt
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
# 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.
-$(RECURSIVE_TARGETS):
+# 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= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ 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; \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+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
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+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
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || 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; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
uninstall-am: uninstall-pkgconfigDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
- ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all check-am install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am check-local clean \
- clean-generic clean-libtool ctags ctags-recursive dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am check-local 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-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-recursive uninstall uninstall-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
uninstall-pkgconfigDATA
GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
ignore_logdir=false ; \
fi ; \
+ if test -d "$(top_srcdir)/.git"; then \
+ export REVISION="`git describe`" ; \
+ else \
+ export REVISION="$(JSON_VERSION) $(JSON_RELEASE_STATUS)" ; \
+ fi ; \
+ export TIMESTAMP=`date +%Y-%m-%dT%H:%M:%S%z` ; \
for subdir in $(SUBDIRS) . ; do \
test "$$subdir" = "." -o "$$subdir" = "po" || \
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
done ; \
$$ignore_logdir || { \
- echo '<?xml version="1.0"?>' > $@.xml ; \
- echo '<report-collection>' >> $@.xml ; \
- echo '<info>' >> $@.xml ; \
- echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
- echo ' <version>$(VERSION)</version>' >> $@.xml ; \
- echo '</info>' >> $@.xml ; \
+ echo '<?xml version="1.0"?>' > $@.xml ; \
+ echo '<report-collection>' >> $@.xml ; \
+ echo '<info>' >> $@.xml ; \
+ echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
+ echo ' <version>$(JSON_VERSION)</version>' >> $@.xml ; \
+ echo " <revision>$$REVISION</revision>" >> $@.xml ; \
+ echo " <date>$$TIMESTAMP</date>" >> $@.xml ; \
+ echo '</info>' >> $@.xml ; \
for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
done ; \
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
# This file 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.
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
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'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])
+_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
fi[]dnl
])# PKG_CHECK_MODULES
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
# Configure paths for GLIB
# Owen Taylor 1997-2001
rm -f conf.glibtest
])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 1
-
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.13.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.13.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 1
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 12
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file 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.
-#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 16
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 1
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 2
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 4
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
rm -f confinc confmf
])
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 6
-
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 1
-
# AM_PROG_MKDIR_P
# ---------------
-# Check for `mkdir -p'.
+# Check for 'mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl FIXME to be removed in Automake 1.14.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 5
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
# ------------------------
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 1
-
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 5
-
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 2
-
# AM_SILENT_RULES([DEFAULT])
# --------------------------
# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
dnl See automake bug#9928 and bug#10237.
am_make=${MAKE-make}
am_cv_make_support_nested_variables=no
fi])
if test $am_cv_make_support_nested_variables = yes; then
- dnl Using `$V' instead of `$(V)' breaks IRIX make.
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
else
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 1
-
# AM_PROG_INSTALL_STRIP
# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 3
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
#
# This file 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.
-# serial 2
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
+# Solaris sh will not grok spaces in the rhs of '-'.
for _am_tool in $_am_tools
do
case $_am_tool in
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
build_triplet = @build@
host_triplet = @host@
subdir = build
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in compile \
- config.guess config.rpath config.sub depcomp install-sh \
- ltmain.sh missing
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am compile \
+ config.guess config.rpath config.sub install-sh missing \
+ ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
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_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 =
-RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive
+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=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+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)
-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.
-$(RECURSIVE_TARGETS):
+# 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= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ 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; \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+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
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
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || 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; \
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
- ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am check-local clean clean-generic \
- clean-libtool ctags ctags-recursive 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 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-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.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 \
+ 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
test-report:
GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
ignore_logdir=false ; \
fi ; \
+ if test -d "$(top_srcdir)/.git"; then \
+ export REVISION="`git describe`" ; \
+ else \
+ export REVISION="$(JSON_VERSION) $(JSON_RELEASE_STATUS)" ; \
+ fi ; \
+ export TIMESTAMP=`date +%Y-%m-%dT%H:%M:%S%z` ; \
for subdir in $(SUBDIRS) . ; do \
test "$$subdir" = "." -o "$$subdir" = "po" || \
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
done ; \
$$ignore_logdir || { \
- echo '<?xml version="1.0"?>' > $@.xml ; \
- echo '<report-collection>' >> $@.xml ; \
- echo '<info>' >> $@.xml ; \
- echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
- echo ' <version>$(VERSION)</version>' >> $@.xml ; \
- echo '</info>' >> $@.xml ; \
+ echo '<?xml version="1.0"?>' > $@.xml ; \
+ echo '<report-collection>' >> $@.xml ; \
+ echo '<info>' >> $@.xml ; \
+ echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
+ echo ' <version>$(JSON_VERSION)</version>' >> $@.xml ; \
+ echo " <revision>$$REVISION</revision>" >> $@.xml ; \
+ echo " <date>$$TIMESTAMP</date>" >> $@.xml ; \
+ echo '</info>' >> $@.xml ; \
for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
done ; \
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
build_triplet = @build@
host_triplet = @host@
subdir = build/autotools
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
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_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__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: check-am install-am install-strip
.PHONY: all all-am check check-am check-local clean clean-generic \
- clean-libtool distclean distclean-generic distclean-libtool \
- 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 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 \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am
+ clean-libtool cscopelist-am ctags-am distclean \
+ distclean-generic distclean-libtool 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 \
+ 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am
# needed to avoid including Makefile.am.gtest
dnl don't check for glib if we build glib
if test "x$PACKAGE_NAME" != "xglib"; then
dnl don't fail if someone does not have glib
- PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,)
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
fi
fi
enable_gtk_doc_pdf=no
fi
+ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+ fi
+ AC_SUBST([AM_DEFAULT_VERBOSITY])
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
esac
}
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
;;
esac
;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
-l*)
- lib=${1#-l}
- found=no
- save_IFS=$IFS
- IFS=';'
- for dir in $lib_path $LIB
- do
- IFS=$save_IFS
- if $shared && test -f "$dir/$lib.dll.lib"; then
- found=yes
- set x "$@" "$dir/$lib.dll.lib"
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- set x "$@" "$dir/$lib.lib"
- break
- fi
- done
- IFS=$save_IFS
-
- test "$found" != yes && set x "$@" "$lib.lib"
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
shift
;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
-L*)
- func_file_conv "${1#-L}"
- if test -z "$lib_path"; then
- lib_path=$file
- else
- lib_path="$lib_path;$file"
- fi
- linker_opts="$linker_opts -LIBPATH:$file"
+ func_cl_dashL "${1#-L}"
;;
-static)
shared=false
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-12-29'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | be32 | be64 \
+ | arc \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
c4x-* | tic4x-*)
os=-coff
;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*)
os=-coff
;;
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-10-18.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
case $1 in
'')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
Environment variables:
depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ object Object file output by 'PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
tmpdepfile Temporary file to use when outputting dependencies.
;;
esac
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'. Note that this directory component will
+# be either empty or ending with a '/' character. This is deliberate.
+set_dir_from ()
+{
+ case $1 in
+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+ *) dir=;;
+ esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+ echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+ # If the compiler actually managed to produce a dependency file,
+ # post-process it.
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form 'foo.o: dependency.h'.
+ # Do two passes, one to just change these to
+ # $object: dependency.h
+ # and one to simply output
+ # dependency.h:
+ # which is needed to avoid the deleted-header problem.
+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+ } > "$depfile"
+ rm -f "$tmpdepfile"
+ else
+ make_dummy_depfile
+ fi
+}
+
+# A tabulation character.
+tab=' '
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
fi
if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvisualcpp
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
fi
if test "$depmode" = msvc7msys; then
- # This is just like msvc7 but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvc7
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
fi
case "$depmode" in
done
"$@"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+ # The second -e expression handles DOS-style file names with drive
+ # letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
+## Some versions of gcc put a space before the ':'. On the theory
## that the space means something, we add a space to the output as
## well. hp depmode also adds that space, but also prefixes the VPATH
## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
-
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
+ # the IRIX cc adds comments like '#:fec' to the end of the
# dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
echo >> "$depfile"
-
# The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile"
;;
+xlc)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
+ # current directory. Also, the AIX compiler puts '$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
"$@" -M
fi
stat=$?
-
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
do
test -f "$tmpdepfile" && break
done
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ aix_post_process_depfile
+ ;;
+
+tcc)
+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+ # FIXME: That version still under development at the moment of writing.
+ # Make that this statement remains true also for stable, released
+ # versions.
+ # It will wrap lines (doesn't matter whether long or short) with a
+ # trailing '\', as in:
+ #
+ # foo.o : \
+ # foo.c \
+ # foo.h \
+ #
+ # It will put a trailing '\' even on the last line, and will use leading
+ # spaces rather than leading tabs (at least since its commit 0394caf7
+ # "Emit spaces for -MD").
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
fi
+ rm -f "$depfile"
+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+ # We have to change lines of the first kind to '$object: \'.
+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+ # And for each line of the second kind, we have to emit a 'dep.h:'
+ # dummy dependency, to avoid the deleted-header problem.
+ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
+ # and will wrap long lines using '\' :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
+ set_dir_from "$object"
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ set_base_from "$source"
+ tmpdepfile=$base.d
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir=$base.d-lock
+ trap "
+ echo '$0: caught signal, cleaning up...' >&2
+ rmdir '$lockdir'
+ exit 1
+ " 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0; do
+ # mkdir is a portable test-and-set.
+ if mkdir "$lockdir" 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rmdir "$lockdir"
+ break
+ else
+ # If the lock is being held by a different process, wait
+ # until the winning process is done or we timeout.
+ while test -d "$lockdir" && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
# Some versions of the HPUX 10.20 sed can't process this invocation
# correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
"$@" +Maked
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add 'dependent.h:' lines.
sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
else
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ set_dir_from "$object"
+ set_base_from "$object"
+
+ if test "$libtool" = yes; then
+ # Libtool generates 2 separate objects for the 2 libraries. These
+ # two compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir$base.o.d # libtool 1.5
+ tmpdepfile2=$dir.libs/$base.o.d # Likewise.
+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ # Same post-processing that is required for AIX mode.
+ aix_post_process_depfile
+ ;;
msvc7)
if test "$libtool" = yes; then
"$@" $showIncludes > "$tmpdepfile"
stat=$?
grep -v '^Note: including file: ' "$tmpdepfile"
- if test "$stat" = 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
p
}' | $cygpath_u | sort -u | sed -n '
s/ /\\ /g
-s/\(.*\)/ \1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
s/.\(.*\) \\/\1:/
H
$ {
- s/.*/ /
+ s/.*/'"$tab"'/
G
p
}' >> "$depfile"
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
done
test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
+ # Require at least two characters before searching for ':'
# in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
"$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this sed invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
# makedepend may prepend the VPATH from the source file name to the object.
# No need to regex-escape $object, excess matching of '.' is harmless.
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process the last invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed '1,2d' "$tmpdepfile" \
+ | tr ' ' "$nl" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
esac
done
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
+ "$@" -E \
+ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ | sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
+ set fnord "$@"
+ shift
+ shift
+ ;;
*)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
esac
done
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+ echo "$tab" >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call `install-sh -d' without argument.
+ # It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
for src
do
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
+ # other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake@gnu.org>."
exit $?
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
;;
-esac
-
-exit 0
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
--- /dev/null
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error. This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+ echo "$0: $*" >&2
+ print_usage >&2
+ exit 2
+}
+
+print_usage ()
+{
+ cat <<END
+Usage:
+ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+ [--expect-failure={yes|no}] [--color-tests={yes|no}]
+ [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file= # Where to save the output of the test script.
+trs_file= # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+ case $1 in
+ --help) print_usage; exit $?;;
+ --version) echo "test-driver $scriptversion"; exit $?;;
+ --test-name) test_name=$2; shift;;
+ --log-file) log_file=$2; shift;;
+ --trs-file) trs_file=$2; shift;;
+ --color-tests) color_tests=$2; shift;;
+ --expect-failure) expect_failure=$2; shift;;
+ --enable-hard-errors) enable_hard_errors=$2; shift;;
+ --) shift; break;;
+ -*) usage_error "invalid option: '$1'";;
+ esac
+ shift
+done
+
+if test $color_tests = yes; then
+ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+ red='\e[0;31m' # Red.
+ grn='\e[0;32m' # Green.
+ lgn='\e[1;32m' # Light green.
+ blu='\e[1;34m' # Blue.
+ mgn='\e[0;35m' # Magenta.
+ std='\e[m' # No color.
+else
+ red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+ estatus=1
+fi
+
+case $estatus:$expect_failure in
+ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+ 0:*) col=$grn res=PASS recheck=no gcopy=no;;
+ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
+ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
+ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
+ *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
SUBDIRS = vs9 vs10
-EXTRA_DIST = config.h.win32.in config.h.win32
+EXTRA_DIST = \
+ config.h.win32.in \
+ config.h.win32 \
+ gen-file-list-jsonglib.py \
+ gengir_jsonglib.bat
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
build_triplet = @build@
host_triplet = @host@
subdir = build/win32
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/config.h.win32.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = config.h.win32
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_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 =
-RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive
+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=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+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)
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = vs9 vs10
-EXTRA_DIST = config.h.win32.in config.h.win32
+EXTRA_DIST = \
+ config.h.win32.in \
+ config.h.win32 \
+ gen-file-list-jsonglib.py \
+ gengir_jsonglib.bat
+
all: all-recursive
.SUFFIXES:
-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.
-$(RECURSIVE_TARGETS):
+# 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= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ 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; \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+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
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
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || 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; \
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive 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 \
- 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-recursive \
- uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am 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 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
# Tell versions [3.59,3.63) of GNU make to not export all variables.
/* The prefix for our gettext translation domains. */
#define GETTEXT_PACKAGE "json-glib-1.0"
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#define HAVE_DCGETTEXT 1
+
/* Define to 1 if you have the <dlfcn.h> header file. */
/*#undef HAVE_DLFCN_H*/
+/* Whether you have gcov */
+/* #undef HAVE_GCOV */
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* Define if you have the iconv() function and it works. */
+#define HAVE_ICONV 1
+
/* Define to 1 if you have the <inttypes.h> header file. */
/*#undef HAVE_INTTYPES_H*/
#define PACKAGE_NAME "json-glib"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "json-glib 0.15.2"
+#define PACKAGE_STRING "json-glib 0.16.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "json-glib"
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.15.2"
+#define PACKAGE_VERSION "0.16.0"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* The prefix for our gettext translation domains. */
#define GETTEXT_PACKAGE "json-glib-1.0"
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#define HAVE_DCGETTEXT 1
+
/* Define to 1 if you have the <dlfcn.h> header file. */
/*#undef HAVE_DLFCN_H*/
+/* Whether you have gcov */
+/* #undef HAVE_GCOV */
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* Define if you have the iconv() function and it works. */
+#define HAVE_ICONV 1
+
/* Define to 1 if you have the <inttypes.h> header file. */
/*#undef HAVE_INTTYPES_H*/
--- /dev/null
+#!/usr/bin/python
+# vim: encoding=utf-8
+# Generate the file lists for processing with g-ir-scanner
+import os
+import sys
+import re
+import string
+import subprocess
+import optparse
+
+def gen_jsonglib_filelist(srcroot, subdir, dest):
+ vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+ vars = {'srcdir':'../json-glib',
+ 'top_srcdir':'..'},
+ conds = {'HAVE_INTROSPECTION':True},
+ filters = ['Json_1_0_gir_FILES'])
+
+ files = vars['Json_1_0_gir_FILES'].split()
+ if (srcroot == '..\\..'):
+ relative_srcdir = '..'
+ else:
+ relative_srcdir = 'srcroot'
+
+ with open(dest, 'w') as d:
+ for i in files:
+ d.write(relative_srcdir + '\\' + i.replace('/', '\\') + '\n')
+
+def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
+ '''
+ path: path to the Makefile.am
+ vars: predefined variables
+ conds: condition variables for Makefile
+ filters: if None, all variables defined are returned,
+ otherwise, it is a list contains that variables should be returned
+ '''
+ cur_vars = vars.copy()
+ RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
+ RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
+ RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
+ RE_AM_CONTINUING = re.compile(r'\\\s*$')
+ RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
+ RE_AM_ELSE = re.compile(r'^\s*else')
+ RE_AM_ENDIF = re.compile(r'^\s*endif')
+ def am_eval(cont):
+ return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont)
+ with open(path, 'r') as f:
+ contents = f.readlines()
+ #combine continuing lines
+ i = 0
+ ncont = []
+ while i < len(contents):
+ line = contents[i]
+ if RE_AM_CONTINUING.search(line):
+ line = RE_AM_CONTINUING.sub('', line)
+ j = i + 1
+ while j < len(contents) and RE_AM_CONTINUING.search(contents[j]):
+ line += RE_AM_CONTINUING.sub('', contents[j])
+ j += 1
+ else:
+ if j < len(contents):
+ line += contents[j]
+ i = j
+ else:
+ i += 1
+ ncont.append(line)
+
+ #include, var define, var evaluation
+ i = -1
+ skip = False
+ oldskip = []
+ while i < len(ncont) - 1:
+ i += 1
+ line = ncont[i]
+ mo = RE_AM_IF.search(line)
+ if mo:
+ oldskip.append(skip)
+ skip = False if mo.group(1) in conds and conds[mo.group(1)] \
+ else True
+ continue
+ mo = RE_AM_ELSE.search(line)
+ if mo:
+ skip = not skip
+ continue
+ mo = RE_AM_ENDIF.search(line)
+ if mo:
+ skip = oldskip.pop()
+ continue
+ if not skip:
+ mo = RE_AM_INCLUDE.search(line)
+ if mo:
+ cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None))
+ continue
+ mo = RE_AM_VAR.search(line)
+ if mo:
+ cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
+ continue
+
+ #filter:
+ if filters != None:
+ ret = {}
+ for i in filters:
+ ret[i] = cur_vars.get(i, '')
+ return ret
+ else:
+ return cur_vars
+
+def main(argv):
+ srcroot = '..\\..'
+ subdir = 'json-glib'
+ gen_jsonglib_filelist(srcroot, subdir, 'json_list')
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
--- /dev/null
+@echo off\r
+\r
+setlocal EnableDelayedExpansion\r
+\r
+rem Needed environmental variables:\r
+rem PLAT: Windows platform-Win32 (i.e. x86) or x64 (i.e. x86-64)\r
+rem CONF: Configuration Type, Release or Debug\r
+rem VSVER: Visual C++ version used [9, 10 or 11]\r
+rem BASEDIR: Where the dependent libraries/headers are located\r
+rem PKG_CONFIG_PATH: Where the GLib and its dependent pkg-config .pc files can be found\r
+rem MINGWDIR: Installation path of MINGW GCC, so gcc.exe can be found in %MINGWDIR%\bin.\r
+\r
+rem Note that the Python executable/installation and all the runtime dependencies of the\r
+rem library/libraries need to be in your PATH or %BASEBIN%\bin.\r
+\r
+rem Check the environemental variables...\r
+if /i "%PLAT%" == "Win32" goto PLAT_OK\r
+if /i "%PLAT%" == "x64" goto PLAT_OK\r
+if /i "%PLAT%" == "x86" (\r
+ set PLAT=Win32\r
+ goto PLAT_OK\r
+)\r
+if /i "%PLAT%" == "x86-64" (\r
+ set PLAT=x64\r
+ goto PLAT_OK\r
+)\r
+goto ERR_PLAT\r
+\r
+:PLAT_OK\r
+if "%VSVER%" == "9" goto VSVER_OK\r
+if "%VSVER%" == "10" goto VSVER_OK\r
+if "%VSVER%" == "11" goto VSVER_OK\r
+goto ERR_VSVER\r
+:VSVER_OK\r
+if /i "%CONF%" == "Release" goto CONF_OK\r
+if /i "%CONF%" == "Debug" goto CONF_OK\r
+goto ERR_CONF\r
+:CONF_OK\r
+if "%BASEDIR%" == "" goto ERR_BASEDIR\r
+if not exist %BASEDIR% goto ERR_BASEDIR\r
+\r
+if "%PKG_CONFIG_PATH%" == "" goto ERR_PKGCONFIG\r
+if not exist %PKG_CONFIG_PATH%\gobject-2.0.pc goto ERR_PKGCONFIG\r
+\r
+if "%MINGWDIR%" == "" goto ERR_MINGWDIR\r
+if not exist %MINGWDIR%\bin\gcc.exe goto ERR_MINGWDIR\r
+\r
+set CC=cl\r
+set BINDIR=%CD%\vs%VSVER%\%CONF%\%PLAT%\bin\r
+set INCLUDE=%BASEDIR%\include\glib-2.0;%BASEDIR%\lib\glib-2.0\include;%INCLUDE%\r
+set LIB=%BINDIR%;%BASEDIR%\lib;%LIB%\r
+set PATH=%BINDIR%;%BASEDIR%\bin;%PATH%;%MINGWDIR%\bin\r
+set PYTHONPATH=%BASEDIR%\lib\gobject-introspection;%BINDIR%\r
+\r
+echo Setup .bat and filelist for generating Json-1.0.gir...\r
+\r
+call python gen-file-list-jsonglib.py\r
+\r
+rem ===============================================================================\r
+rem Begin setup of json_gir.bat to create Json-1.0.gir\r
+rem (The ^^ is necessary to span the command to multiple lines on Windows cmd.exe!)\r
+rem ===============================================================================\r
+\r
+echo echo Generating Json-1.0.gir...> json_gir.bat\r
+echo @echo off>> json_gir.bat\r
+echo.>> json_gir.bat\r
+\r
+echo copy /b %BINDIR%\json-glib-1.0.lib %BINDIR%\json-1.0.lib>> json_gir.bat\r
+echo.>> json_gir.bat\r
+rem ================================================================\r
+rem Setup the command line flags to g-ir-scanner for Json-1.0.gir...\r
+rem ================================================================\r
+echo python %BASEDIR%\bin\g-ir-scanner --verbose -I..\.. ^^>> json_gir.bat\r
+echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include ^^>> json_gir.bat\r
+echo --namespace=Json --nsversion=1.0 ^^>> json_gir.bat\r
+echo --include=GObject-2.0 --include=Gio-2.0 ^^>> json_gir.bat\r
+echo --no-libtool --library=json-glib-1-vs%VSVER% ^^>> json_gir.bat\r
+echo --reparse-validate --add-include-path=%BASEDIR%\share\gir-1.0 --add-include-path=. ^^>> json_gir.bat\r
+echo --warn-all --pkg-export json-glib-1.0 --c-include "json-glib/json-glib.h" ^^>> json_gir.bat\r
+echo -I..\.. -DJSON_COMPILATION=1 -DG_LOG_DOMAIN=\"Json\" ^^>> json_gir.bat\r
+echo --filelist=json_list ^^>> json_gir.bat\r
+echo -o Json-1.0.gir>> json_gir.bat\r
+echo.>> json_gir.bat\r
+\r
+echo del %BINDIR%\json-1.0.lib>> json_gir.bat\r
+echo.>> json_gir.bat\r
+\r
+echo Completed setup of .bat for generating Json-1.0.gir.\r
+echo.>> json_gir.bat\r
+\r
+rem =======================\r
+rem Now generate the .gir's\r
+rem =======================\r
+CALL json_gir.bat\r
+\r
+rem Clean up the .bat and filelist for generating the .gir files...\r
+del json_gir.bat\r
+del json_list\r
+\r
+rem Now compile the generated .gir files\r
+%BASEDIR%\bin\g-ir-compiler --includedir=. --debug --verbose Json-1.0.gir -o Json-1.0.typelib\r
+\r
+rem Copy the generated .girs and .typelibs to their appropriate places\r
+\r
+mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\r
+move /y *.gir %BASEDIR%\share\gir-1.0\\r
+\r
+mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0\r
+move /y *.typelib %BASEDIR%\lib\girepository-1.0\\r
+\r
+goto DONE\r
+\r
+:ERR_PLAT\r
+echo You need to specify a valid Platform [set PLAT=Win32 or PLAT=x64]\r
+goto DONE\r
+:ERR_VSVER\r
+echo You need to specify your Visual Studio version [set VSVER=9 or VSVER=10 or VSVER=11]\r
+goto DONE\r
+:ERR_CONF\r
+echo You need to specify a valid Configuration [set CONF=Release or CONF=Debug]\r
+goto DONE\r
+:ERR_BASEDIR\r
+echo You need to specify a valid BASEDIR.\r
+goto DONE\r
+:ERR_PKGCONFIG\r
+echo You need to specify a valid PKG_CONFIG_PATH\r
+goto DONE\r
+:ERR_MINGWDIR\r
+echo You need to specify a valid MINGWDIR, where a valid gcc installation can be found.\r
+goto DONE\r
+:DONE\r
+\r
serialize-simple.vcxproj \
serialize-simple.vcxproj.filters \
README.txt \
+ gengir.vcxproj \
$(NULL)
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
build_triplet = @build@
host_triplet = @host@
subdir = build/win32/vs10
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
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_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__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
serialize-simple.vcxproj \
serialize-simple.vcxproj.filters \
README.txt \
+ gengir.vcxproj \
$(NULL)
all: all-am
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool 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 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 maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool 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 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 \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B15}</ProjectGuid>
+ <RootNamespace>gengir</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="json-glib.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="json-glib.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="json-glib.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="json-glib.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <PreBuildEvent>
+ <Command>$(DoGenGir)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Command>$(DoGenGir)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <PreBuildEvent>
+ <Command>$(DoGenGir)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Command>$(DoGenGir)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="json-glib.vcxproj">
+ <Project>{469db0a8-e33e-4112-a38c-52a168ecdc03}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
- <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+ <VSVer>10</VSVer>
+ <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
- <JsonGlibVersion>1.0</JsonGlibVersion>
+ <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
+ <ApiVersion>1.0</ApiVersion>
<PrepBuild>
if exist ..\..\..\config.h goto DONE_CONFIG_H
copy ..\..\..\json-glib\tests\stream-load.json $(CopyDir)\bin
-mkdir $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-gvariant.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-gvariant.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-path.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-path.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
-copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
+copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
</JsonGlibDoInstall>
- <JsonGlibGenerateDef>echo EXPORTS >"..\..\..\json-glib\json-glib.def" && cl /EP ..\..\..\json-glib\json-glib.symbols >>"..\..\..\json-glib\json-glib.def"</JsonGlibGenerateDef>
+<DoGenGir>
+set VSVER=$(VSVer)
+set CONF=$(Configuration)
+set PLAT=$(Platform)
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
+cd ..
+call gengir_jsonglib.bat
+
+cd vs$(VSVer)
+</DoGenGir>
+ <JsonGlibGenerateDef>
+echo EXPORTS >$(DefDir)\json-glib.def
+cl /EP ..\..\..\json-glib\json-glib.symbols >>$(DefDir)\json-glib.def
+ </JsonGlibGenerateDef>
<JsonGlibDefines>JSON_COMPILATION;G_LOG_DOMAIN="Json"</JsonGlibDefines>
<JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
<JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
- <JsonGlibSeparateVS10DllPrefix />
- <JsonGlibSeparateVS10DllSuffix>-1-vs10</JsonGlibSeparateVS10DllSuffix>
- <JsonGlibDllPrefix>$(JsonGlibSeparateVS10DllPrefix)</JsonGlibDllPrefix>
- <JsonGlibDllSuffix>$(JsonGlibSeparateVS10DllSuffix)</JsonGlibDllSuffix>
+ <JsonGlibSeparateVSDllPrefix />
+ <JsonGlibSeparateVSDllSuffix>-1-vs$(VSVer)</JsonGlibSeparateVSDllSuffix>
+ <JsonGlibDllPrefix>$(JsonGlibSeparateVSDllPrefix)</JsonGlibDllPrefix>
+ <JsonGlibDllSuffix>$(JsonGlibSeparateVSDllSuffix)</JsonGlibDllSuffix>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>jsonglibprops</_PropertySheetDisplayName>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <BuildMacro Include="VSVer">
+ <Value>$(VSVer)</Value>
+ </BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
+ <BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
+ <Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
+ </BuildMacro>
<BuildMacro Include="CopyDir">
<Value>$(CopyDir)</Value>
</BuildMacro>
<BuildMacro Include="JsonGlibGenerateDef">
<Value>$(JsonGlibGenerateDef)</Value>
</BuildMacro>
- <BuildMacro Include="JsonGlibVersion">
- <Value>$(JsonGlibVersion)</Value>
+ <BuildMacro Include="ApiVersion">
+ <Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="JsonGlibDefines">
<Value>$(JsonGlibDefines)</Value>
<BuildMacro Include="JsonGlibLibtoolCompatibleDllSuffix">
<Value>$(JsonGlibLibtoolCompatibleDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="JsonGlibSeparateVS10DllPrefix">
- <Value>$(JsonGlibSeparateVS10DllPrefix)</Value>
+ <BuildMacro Include="JsonGlibSeparateVSDllPrefix">
+ <Value>$(JsonGlibSeparateVSDllPrefix)</Value>
</BuildMacro>
- <BuildMacro Include="JsonGlibSeparateVS10DllSuffix">
- <Value>$(JsonGlibSeparateVS10DllSuffix)</Value>
+ <BuildMacro Include="JsonGlibSeparateVSDllSuffix">
+ <Value>$(JsonGlibSeparateVSDllSuffix)</Value>
</BuildMacro>
<BuildMacro Include="JsonGlibDllPrefix">
<Value>$(JsonGlibDllPrefix)</Value>
<BuildMacro Include="JsonGlibDllSuffix">
<Value>$(JsonGlibDllSuffix)</Value>
</BuildMacro>
+ <BuildMacro Include="DefDir">
+ <Value>$(DefDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="DoGenGir">
+ <Value>$(DoGenGir)</Value>
+ </BuildMacro>
</ItemGroup>
</Project>
\ No newline at end of file
\r
Microsoft Visual Studio Solution File, Format Version 11.00\r
-# Visual C++ Express 2010\r
+# Visual Studio 2010\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "array", "array.vcxproj", "{9B2921C9-577F-418D-8341-6D79771DDCEC}"\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builder", "builder.vcxproj", "{B7D32B02-3481-4A6E-8E0F-B43887F348A8}"\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}"\r
EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"\r
+EndProject\r
Global\r
GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
Debug|Win32 = Debug|Win32\r
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|Win32.Build.0 = Release|Win32\r
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.ActiveCfg = Release|x64\r
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.Build.0 = Release|x64\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64\r
EndGlobalSection\r
GlobalSection(SolutionProperties) = preSolution\r
HideSolutionNode = FALSE\r
</PreLinkEvent>
<Link>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
</PreLinkEvent>
<Link>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
</PreLinkEvent>
<Link>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
</PreLinkEvent>
<Link>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\json-glib\json-glib.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(IntDir)\json-glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
serialize-full.vcproj \
serialize-simple.vcproj \
README.txt \
+ gengir.vcproj \
$(NULL)
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
build_triplet = @build@
host_triplet = @host@
subdir = build/win32/vs9
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
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_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__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
serialize-full.vcproj \
serialize-simple.vcproj \
README.txt \
+ gengir.vcproj \
$(NULL)
all: all-am
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool 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 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 maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool 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 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 \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
--- /dev/null
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="gengir"
+ ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B15}"
+ RootNamespace="gengir"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\json-glib.vsprops"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ ConfigurationType="10"
+ CharacterSet="2"
+ DeleteExtensionsOnClean=""
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(DoGenGir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ InheritedPropertySheets=".\json-glib.vsprops"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ ConfigurationType="10"
+ CharacterSet="2"
+ DeleteExtensionsOnClean=""
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(DoGenGir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\json-glib.vsprops"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ ConfigurationType="10"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ DeleteExtensionsOnClean=""
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(DoGenGir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ InheritedPropertySheets=".\json-glib.vsprops"
+ OutputDirectory="$(GlibEtcInstallRoot)"
+ ConfigurationType="10"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ DeleteExtensionsOnClean=""
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="$(DoGenGir)"
+ />
+ </Configuration>
+ </Configurations>
+</VisualStudioProject>
Name="Debug|Win32"
InheritedPropertySheets=".\json-glib.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Name="Release|Win32"
InheritedPropertySheets=".\json-glib.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
{FF640D73-9BCD-4B75-B63F-75175A3C9F67} = {FF640D73-9BCD-4B75-B63F-75175A3C9F67}\r
EndProjectSection\r
EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"\r
+ ProjectSection(ProjectDependencies) = postProject\r
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}\r
+ EndProjectSection\r
+EndProject\r
Global\r
GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
Debug|Win32 = Debug|Win32\r
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|Win32.Build.0 = Release|Win32\r
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.ActiveCfg = Release|x64\r
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.Build.0 = Release|x64\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32\r
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64\r
EndGlobalSection\r
GlobalSection(SolutionProperties) = preSolution\r
HideSolutionNode = FALSE\r
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="2"
InheritedPropertySheets=".\json-glib.vsprops"
CharacterSet="2"
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
AdditionalDependencies=""
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="2"
InheritedPropertySheets=".\json-glib.vsprops"
CharacterSet="2"
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
AdditionalDependencies=""
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="2"
InheritedPropertySheets=".\json-glib.vsprops"
CharacterSet="2"
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
AdditionalDependencies=""
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="2"
InheritedPropertySheets=".\json-glib.vsprops"
CharacterSet="2"
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
AdditionalDependencies=""
OutputFile="$(OutDir)\$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\json-glib\json-glib.def"
+ ModuleDefinitionFile="$(IntDir)\json-glib.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(JsonGlibVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"\r
/>\r
<UserMacro\r
+ Name="VSVer"\r
+ Value="9"\r
+ />\r
+ <UserMacro\r
+ Name="GlibEtcInstallRoot"\r
+ Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"\r
+ />\r
+ <UserMacro\r
+ Name="GlibEtcInstallRootFromBuildWin32"\r
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"\r
+ />\r
+ <UserMacro\r
+ Name="CopyDir"\r
+ Value="$(GlibEtcInstallRoot)"\r
+ />\r
+ <UserMacro\r
+ Name="DefDir"\r
+ Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"\r
+ />\r
+ <UserMacro\r
Name="PrepBuild"\r
Value="\r
if exist ..\..\..\config.h goto DONE_CONFIG_H
\r
"\r
/>\r
<UserMacro\r
- Name="JsonGlibVersion"\r
+ Name="ApiVersion"\r
Value="1.0"\r
/>\r
<UserMacro\r
Name="JsonGlibDoInstall"\r
Value="\r
-mkdir $(OutDir)
\r
-mkdir $(OutDir)\bin
\r
-mkdir $(OutDir)\lib
\r
+mkdir $(CopyDir)
\r
+mkdir $(CopyDir)\bin
\r
+mkdir $(CopyDir)\lib
\r
\r
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.lib $(OutDir)\lib
\r
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.lib $(CopyDir)\lib
\r
\r
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin
\r
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin
\r
-copy ..\..\..\json-glib\tests\stream-load.json $(OutDir)\bin
\r
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin
\r
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin
\r
+copy ..\..\..\json-glib\tests\stream-load.json $(CopyDir)\bin
\r
\r
-mkdir $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
+mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
\r
-copy ..\..\..\json-glib\json-enum-types.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-version.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-glib.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
\r
-copy ..\..\..\json-glib\json-builder.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-generator.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-gobject.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-gvariant.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-path.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-parser.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-reader.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
-copy ..\..\..\json-glib\json-types.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-gvariant.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-path.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
+copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
\r
"\r
/>\r
<UserMacro\r
+ Name="DoGenGir"\r
+ Value="\r
+set VSVER=$(VSVer)
\r
+set CONF=$(ConfigurationName)
\r
+set PLAT=$(PlatformName)
\r
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
\r
+\r
+cd ..
\r
+call gengir_jsonglib.bat
\r
+cd vs$(VSVer)
\r
+ "\r
+ />\r
+ <UserMacro\r
Name="JsonGlibGenerateDef"\r
- Value="echo EXPORTS >"..\..\..\json-glib\json-glib.def" && cl /EP ..\..\..\json-glib\json-glib.symbols >>"..\..\..\json-glib\json-glib.def""\r
+ Value="\r
+echo EXPORTS >$(DefDir)\json-glib.def
\r
+cl /EP ..\..\..\json-glib\json-glib.symbols >>$(DefDir)\json-glib.def
\r
+ "\r
/>\r
<UserMacro\r
Name="JsonGlibDefines"\r
Value="-1.0-0"\r
/>\r
<UserMacro\r
- Name="JsonGlibSeparateVS9DllPrefix"\r
+ Name="JsonGlibSeparateVSDllPrefix"\r
Value=""\r
/>\r
<UserMacro\r
- Name="JsonGlibSeparateVS9DllSuffix"\r
- Value="-1-vs9"\r
+ Name="JsonGlibSeparateVSDllSuffix"\r
+ Value="-1-vs$(VSVer)"\r
/>\r
<!-- Change these two to JsonGlibLibtoolCompatibleDllPrefix and\r
JsonGlibLibtoolCompatibleDllSuffix if that is what you want -->\r
<UserMacro\r
Name="JsonGlibDllPrefix"\r
- Value="$(JsonGlibSeparateVS9DllPrefix)"\r
+ Value="$(JsonGlibSeparateVSDllPrefix)"\r
/>\r
<UserMacro\r
Name="JsonGlibDllSuffix"\r
- Value="$(JsonGlibSeparateVS9DllSuffix)"\r
- />\r
- <UserMacro\r
- Name="GlibEtcInstallRoot"\r
- Value="..\..\..\..\vs9\$(PlatformName)"\r
+ Value="$(JsonGlibSeparateVSDllSuffix)"\r
/>\r
</VisualStudioPropertySheet>\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="Debug|Win32"
InheritedPropertySheets=".\json-glib.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Name="Release|Win32"
InheritedPropertySheets=".\json-glib.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"\r
ConfigurationType="1"\r
InheritedPropertySheets=".\json-glib.vsprops"\r
- CharacterSet="1"\r
+ CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
ConfigurationType="1"
InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for json-glib 0.15.2.
+# Generated by GNU Autoconf 2.69 for json-glib 0.16.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Identity of this package.
PACKAGE_NAME='json-glib'
PACKAGE_TARNAME='json-glib'
-PACKAGE_VERSION='0.15.2'
-PACKAGE_STRING='json-glib 0.15.2'
+PACKAGE_VERSION='0.16.0'
+PACKAGE_STRING='json-glib 0.16.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib'
PACKAGE_URL='http://live.gnome.org/JsonGlib'
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
# 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 0.15.2 to adapt to many kinds of systems.
+\`configure' configures json-glib 0.16.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of json-glib 0.15.2:";;
+ short | recursive ) echo "Configuration of json-glib 0.16.0:";;
esac
cat <<\_ACEOF
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
--disable-glibtest do not try to compile and run a test GLIB program
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-debug=[no/minimum/yes]
- turn on debugging [default=yes]
+ turn on debugging [default=minimum]
--enable-maintainer-flags=[no/yes]
- Use strict compiler flags [default=yes]
+ Use strict compiler flags [default=no]
--enable-gcov Enable gcov
--enable-gtk-doc use gtk-doc to build documentation [[default=no]]
--enable-gtk-doc-html build documentation in html format [[default=yes]]
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-json-glib configure 0.15.2
-generated by GNU Autoconf 2.68
+json-glib configure 0.16.0
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
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 0.15.2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by json-glib $as_me 0.16.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
-am__api_version='1.11'
+am__api_version='1.13'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
esac
fi
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
# Define the identity of the package.
PACKAGE='json-glib'
- VERSION='0.15.2'
+ VERSION='0.16.0'
# Some tools Automake needs.
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
_am_tools='gnutar plaintar pax cpio none'
_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
+# Solaris sh will not grok spaces in the rhs of '-'.
for _am_tool in $_am_tools
do
case $_am_tool in
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=0;;
esac
am_make=${MAKE-make}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
JSON_MAJOR_VERSION=0
-JSON_MINOR_VERSION=15
-JSON_MICRO_VERSION=2
-JSON_VERSION=0.15.2
-JSON_RELEASE_STATUS=snapshot
+JSON_MINOR_VERSION=16
+JSON_MICRO_VERSION=0
+JSON_VERSION=0.16.0
+JSON_RELEASE_STATUS=release
-JSON_LT_CURRENT=1502
+JSON_LT_CURRENT=1600
JSON_LT_REVISION=0
-JSON_LT_AGE=1502
+JSON_LT_AGE=1600
JSON_LT_VERSION="$JSON_LT_CURRENT:$JSON_LT_REVISION:$JSON_LT_AGE"
JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION"
pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.31.0 gio-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.31.0 gio-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.34.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.34.0 gio-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.31.0 gio-2.0" 2>/dev/null`
+ pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.34.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
pkg_cv_JSON_LIBS="$JSON_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.31.0 gio-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.31.0 gio-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.34.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.34.0 gio-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.31.0 gio-2.0" 2>/dev/null`
+ pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.34.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= 2.31.0 gio-2.0" 2>&1`
+ JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 >= 2.34.0 gio-2.0" 2>&1`
else
- JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= 2.31.0 gio-2.0" 2>&1`
+ JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 >= 2.34.0 gio-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$JSON_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gobject-2.0 >= 2.31.0 gio-2.0) were not met:
+ as_fn_error $? "Package requirements (gobject-2.0 >= 2.34.0 gio-2.0) were not met:
$JSON_PKG_ERRORS
Alternatively, you may set the environment variables JSON_CFLAGS
and JSON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
-
else
JSON_CFLAGS=$pkg_cv_JSON_CFLAGS
JSON_LIBS=$pkg_cv_JSON_LIBS
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug;
else
- enable_debug=yes
+ enable_debug=minimum
fi
if test "${enable_maintainer_flags+set}" = set; then :
enableval=$enable_maintainer_flags;
else
- enable_maintainer_flags=yes
+ enable_maintainer_flags=no
fi
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_SHTOOL="shtool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LTP="lcov"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LTP_GENHTML="genhtml"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
+ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
else
- GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
+ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met:
-
-$GTKDOC_DEPS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
+ :
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
+ :
else
GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
enable_gtk_doc_pdf=no
fi
+ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+ fi
+
if test x$enable_gtk_doc = xyes; then
ENABLE_GTK_DOC_TRUE=
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# 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 0.15.2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by json-glib $as_me 0.16.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
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 0.15.2
-configured by $0, generated by GNU Autoconf 2.68,
+json-glib config.status 0.16.0
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
# bump micro_version to the next even number for each point release
# bump micro_version to the next odd number after each release
m4_define([json_major_version], [0])
-m4_define([json_minor_version], [15])
-m4_define([json_micro_version], [2])
+m4_define([json_minor_version], [16])
+m4_define([json_micro_version], [0])
m4_define([json_version], [json_major_version.json_minor_version.json_micro_version])
m4_define([lt_revision], [json_interface_age])
m4_define([lt_age], [m4_eval(json_binary_age - json_interface_age)])
-m4_define([glib_req_version], [2.31.0])
+m4_define([glib_req_version], [2.34.0])
AC_PREREQ([2.63])
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
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_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 =
-RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive
+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=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+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)
-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.
-$(RECURSIVE_TARGETS):
+# 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= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ 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; \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+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
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
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || 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; \
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
- ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am check-local clean clean-generic \
- clean-libtool ctags ctags-recursive 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 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-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.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 \
+ 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
test-report:
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
# Everything below here is generic #
####################################
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(srcdir)/version.xml.in
subdir = doc/reference
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
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_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__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP =
@ENABLE_GTK_DOC_TRUE@@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";
all: all-am
.SUFFIXES:
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: check-am install-am install-strip
.PHONY: all all-am all-local check check-am check-local clean \
- clean-generic clean-libtool clean-local 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 \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-local mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-local
+ 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 maintainer-clean \
+ maintainer-clean-generic maintainer-clean-local mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags-am uninstall uninstall-am uninstall-local
# needed to avoid including Makefile.am.gtest which redeclares
$(REPORT_FILES): sgml-build.stamp
-#### setup ####
-
setup-build.stamp:
- -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- echo ' DOC Preparing build'; \
+ -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
done; \
fi; \
fi
- @touch setup-build.stamp
-
-#### scan ####
+ $(AM_V_at)touch setup-build.stamp
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo ' DOC Scanning header files'
- @_source_dir='' ; \
+ $(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)
- @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- echo " DOC Introspecting gobjects"; \
+ $(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 \
test -f $$i || touch $$i ; \
done \
fi
- @touch scan-build.stamp
+ $(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
-#### xml ####
-
sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
- @echo ' DOC Building XML'
- @_source_dir='' ; \
+ $(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)
- @touch sgml-build.stamp
+ $(AM_V_at)touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
-#### html ####
-
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo ' DOC Building HTML'
- @rm -rf html
- @mkdir html
- @mkhtml_options=""; \
+ $(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 \
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
done;
- @echo ' DOC Fixing cross-references'
- @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- @touch html-build.stamp
-
-#### pdf ####
+ $(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)
- @echo ' DOC Building PDF'
- @rm -f $(DOC_MODULE).pdf
- @mkpdf_options=""; \
+ $(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 \
done; \
fi; \
gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
- @touch pdf-build.stamp
+ $(AM_V_at)touch pdf-build.stamp
##############
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JsonBuilder</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch03.html" title="Generator">
<link rel="prev" href="JsonGenerator.html" title="JsonGenerator">
Creates a new <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>. You can use this object to generate a
JSON tree and obtain the root <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>s.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>the newly created <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a> instance</td>
Returns the root of the current constructed tree, if the build is complete
(ie: all opened objects, object members and arrays are being closed).
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
Resets the state of the <em class="parameter"><code>builder</code></em> back to its initial state.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<td>a <a class="link" href="JsonBuilder.html" title="JsonBuilder"><span class="type">JsonBuilder</span></a>
Can be called for first or only if the call is associated to an object member
or an array element.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
Cannot be 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>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
Can be called for first or only if the call is associated to an object member
or an array element.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
Can be called only if the call is associated to an object.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
Cannot be 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>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
most recent opened object, otherwise <em class="parameter"><code>node</code></em> is added as element of the most
recent opened array.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
See also: <a class="link" href="JsonBuilder.html#json-builder-add-value" title="json_builder_add_value ()"><code class="function">json_builder_add_value()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
See also: <a class="link" href="JsonBuilder.html#json-builder-add-value" title="json_builder_add_value ()"><code class="function">json_builder_add_value()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
See also: <a class="link" href="JsonBuilder.html#json-builder-add-value" title="json_builder_add_value ()"><code class="function">json_builder_add_value()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
See also: <a class="link" href="JsonBuilder.html#json-builder-add-value" title="json_builder_add_value ()"><code class="function">json_builder_add_value()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<p>
See also: <a class="link" href="JsonBuilder.html#json-builder-add-value" title="json_builder_add_value ()"><code class="function">json_builder_add_value()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>builder</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JsonGenerator</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch03.html" title="Generator">
<link rel="prev" href="ch03.html" title="Generator">
JSON data stream starting from a data object model composed by
<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>s.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>the newly created <a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> instance</td>
freed after calling this function.</div>
<p>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
Retrieves a pointer to the root <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> set using
<a class="link" href="JsonGenerator.html#json-generator-set-root" title="json_generator_set_root ()"><code class="function">json_generator_set_root()</code></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
<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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
<p>
Sets the number of repetitions for each indentation level.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
<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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
<p>
Sets the character to be used when indenting
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
<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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
Generates a JSON data stream from <em class="parameter"><code>generator</code></em> and returns it as a
buffer.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
<p>
Outputs JSON data and streams it (synchronously) to <em class="parameter"><code>stream</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>generator</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JsonParser</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch02.html" title="Parser">
<link rel="prev" href="ch02.html" title="Parser">
JSON_PARSER_ERROR_MISSING_COMMA,
JSON_PARSER_ERROR_MISSING_COLON,
JSON_PARSER_ERROR_INVALID_BAREWORD,
-
+ JSON_PARSER_ERROR_EMPTY_MEMBER_NAME,
+
JSON_PARSER_ERROR_UNKNOWN
} JsonParserError;
</pre>
<p>
This enumeration can be extended at later date
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><a name="JSON-PARSER-ERROR-PARSE:CAPS"></a><span class="term"><code class="literal">JSON_PARSER_ERROR_PARSE</code></span></p></td>
</td>
</tr>
<tr>
+<td><p><a name="JSON-PARSER-ERROR-EMPTY-MEMBER-NAME:CAPS"></a><span class="term"><code class="literal">JSON_PARSER_ERROR_EMPTY_MEMBER_NAME</code></span></p></td>
+<td>empty member name (Since: 0.16)
+</td>
+</tr>
+<tr>
<td><p><a name="JSON-PARSER-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">JSON_PARSER_ERROR_UNKNOWN</code></span></p></td>
<td>unknown error
</td>
<p>
<a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> class.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="structfield"><code><a name="JsonParserClass.parse-start"></a>parse_start</code></em> ()</span></p></td>
load a JSON stream from either a file or a buffer and then walk the
hierarchy using the data types API.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>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>
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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
operation was cancelled, the error <code class="literal">G_IO_ERROR_CANCELLED</code> will be set
on the passed <em class="parameter"><code>error</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
then call <a class="link" href="JsonParser.html#json-parser-load-from-stream-finish" title="json_parser_load_from_stream_finish ()"><code class="function">json_parser_load_from_stream_finish()</code></a> to get the result
of the operation.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
<p>
Retrieves the top level node from the parsed JSON stream.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
function from outside the signal handlers emitted by <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> will
yield 0.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
function from outside the signal handlers emitted by <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> will
yield 0.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
<tbody>
<tr>
<td class="listing_lines" align="right"><pre>1</pre></td>
- <td class="listing_code"><pre class="programlisting"><span class="normal">var _json_data </span><span class="symbol">=</span><span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="string">"member_name"</span><span class="normal"> </span><span class="symbol">:</span><span class="normal"> </span><span class="symbol">[</span><span class="normal"> </span><span class="symbol">...</span></pre></td>
+ <td class="listing_code"><pre class="programlisting"><span class="usertype">var</span><span class="normal"> _json_data </span><span class="symbol">=</span><span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="string">"member_name"</span><span class="normal"> </span><span class="symbol">:</span><span class="normal"> </span><span class="symbol">[</span><span class="normal"> </span><span class="symbol">...</span></pre></td>
</tr>
</tbody>
</table>
existence of the assignment in the data stream and the variable name
used.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
has successfully parsed a single element of a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>. The
array and element index are passed to the signal handlers.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
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" title="JsonArray"><span class="type">JsonArray</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
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" title="JsonArray"><span class="type">JsonArray</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
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" title="JsonObject"><span class="type">JsonObject</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
has successfully parsed a single member of a <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>. The
object and member are passed to the signal handlers.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
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" title="JsonObject"><span class="type">JsonObject</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
The ::parse-end signal is emitted when the parser successfully
finished parsing a JSON data stream
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
The ::parse-start signal is emitted when the parser began parsing
a JSON data stream.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>parser</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JsonPath</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch02.html" title="Parser">
<link rel="prev" href="JsonReader.html" title="JsonReader">
Once created, the <a class="link" href="JsonPath.html" title="JsonPath"><span class="type">JsonPath</span></a> object should be used with <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>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>the newly created <a class="link" href="JsonPath.html" title="JsonPath"><span class="type">JsonPath</span></a> instance. Use
<p>
Error code enumeration for the <a class="link" href="JsonPath.html#JSON-PATH-ERROR:CAPS" title="JSON_PATH_ERROR"><code class="literal">JSON_PATH_ERROR</code></a> domain.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><a name="JSON-PATH-ERROR-INVALID-QUERY:CAPS"></a><span class="term"><code class="literal">JSON_PATH_ERROR_INVALID_QUERY</code></span></p></td>
<td>Invalid query
<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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
The matching <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>s will be copied into a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> and
returned wrapped in a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
creates a <a class="link" href="JsonPath.html" title="JsonPath"><span class="type">JsonPath</span></a> instance, compiles <em class="parameter"><code>expression</code></em> and
matches it against the JSON tree pointed by <em class="parameter"><code>root</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>expression</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JsonReader</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch02.html" title="Parser">
<link rel="prev" href="JsonParser.html" title="JsonParser">
Creates a new <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a>. You can use this object to read the contents of
the JSON tree starting from <em class="parameter"><code>node</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
If another <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> is currently set as root, it will be replaced.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
bigger than the size of the array or the object, the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> will be
put in an error state until <a class="link" href="JsonReader.html#json-reader-end-element" title="json_reader_end_element ()"><code class="function">json_reader_end_element()</code></a> is called.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
This function resets the error state of <em class="parameter"><code>reader</code></em>, if any was set
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<td>a <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a>
<p>
Checks whether the <em class="parameter"><code>reader</code></em> is currently on an array
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
Counts the elements of the current position, if <em class="parameter"><code>reader</code></em> is
positioned on an array
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
defined in the object, the <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> will be put in an error state until
<a class="link" href="JsonReader.html#json-reader-end-member" title="json_reader_end_member ()"><code class="function">json_reader_end_member()</code></a> is called.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
This function resets the error state of <em class="parameter"><code>reader</code></em>, if any was set
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<td>a <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a>
<p>
Checks whether the <em class="parameter"><code>reader</code></em> is currently on an object
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
Counts the members of the current position, if <em class="parameter"><code>reader</code></em> is
positioned on an object
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
Retrieves a list of member names from the current position, if <em class="parameter"><code>reader</code></em>
is positioned on an object.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Retrieves the name of the current member.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Checks whether the <em class="parameter"><code>reader</code></em> is currently on a value
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Retrieves the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> of the current position of <em class="parameter"><code>reader</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Retrieves the integer value of the current position of <em class="parameter"><code>reader</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Retrieves the floating point value of the current position of <em class="parameter"><code>reader</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Retrieves the string value of the current position of <em class="parameter"><code>reader</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Retrieves the boolean value of the current position of <em class="parameter"><code>reader</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Checks whether the value of the current position of <em class="parameter"><code>reader</code></em> is 'null'
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<p>
Error codes enumeration for <a class="link" href="JsonReader.html" title="JsonReader"><span class="type">JsonReader</span></a> errors
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><a name="JSON-READER-ERROR-NO-ARRAY:CAPS"></a><span class="term"><code class="literal">JSON_READER_ERROR_NO_ARRAY</code></span></p></td>
Retrieves the <span class="type">GError</span> 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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>reader</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Annotation Glossary</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix08.html" title="Index of new symbols in 0.14">
</td></tr>
</table>
<div class="glossary">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h1></div></div></div>
<a name="glsO"></a><h3 class="title">O</h3>
-<dt>
-<a name="annotation-glossterm-out"></a>out</dt>
-<dd><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
-<dt>
-<a name="annotation-glossterm-out%20caller-allocates"></a>out caller-allocates</dt>
-<dd><p>Out parameter, where caller must allocate storage.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
+<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-out%20caller-allocates"></a>out caller-allocates</span></dt>
+<dd class="glossdef"><p>Out parameter, where caller must allocate storage.</p></dd>
<a name="glsA"></a><h3 class="title">A</h3>
-<dt>
-<a name="annotation-glossterm-allow-none"></a>allow-none</dt>
-<dd><p>NULL is ok, both for passing and for returning.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
+<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
<a name="glsC"></a><h3 class="title">C</h3>
-<dt>
-<a name="annotation-glossterm-closure"></a>closure</dt>
-<dd><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
+<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
-<dt>
-<a name="annotation-glossterm-transfer%20none"></a>transfer none</dt>
-<dd><p>Don't free data after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
+<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
<a name="glsA"></a><h3 class="title">A</h3>
-<dt>
-<a name="annotation-glossterm-array"></a>array</dt>
-<dd><p>Parameter points to an array of items.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
+<dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
<a name="glsE"></a><h3 class="title">E</h3>
-<dt>
-<a name="annotation-glossterm-element-type"></a>element-type</dt>
-<dd><p>Generics and defining elements of containers and arrays.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
+<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
-<dt>
-<a name="annotation-glossterm-transfer%20container"></a>transfer container</dt>
-<dd><p>Free data container after the code is done.</p></dd>
-<dt>
-<a name="annotation-glossterm-transfer%20full"></a>transfer full</dt>
-<dd><p>Free data after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
+<dd class="glossdef"><p>Free data container after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
+<dd class="glossdef"><p>Free data after the code is done.</p></dd>
<a name="glsS"></a><h3 class="title">S</h3>
-<dt>
-<a name="annotation-glossterm-scope%20call"></a>scope call</dt>
-<dd><p>The callback is valid only during the call to the method.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
+<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
</div>
<div class="footer">
<hr>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Data Types</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<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">
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id441962"></a>Data Types</h2></div></div></div>
-<div class="toc"><dl>
+<a name="id-1.3.3"></a>Data Types</h2></div></div></div>
+<div class="toc"><dl class="toc">
<dt>
<span class="refentrytitle"><a href="json-glib-JSON-Node.html">JSON Node</a></span><span class="refpurpose"> — Node in a JSON object model</span>
</dt>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Parser</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<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">
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id441999"></a>Parser</h2></div></div></div>
-<div class="toc"><dl>
+<a name="id-1.4.3"></a>Parser</h2></div></div></div>
+<div class="toc"><dl class="toc">
<dt>
<span class="refentrytitle"><a href="JsonParser.html">JsonParser</a></span><span class="refpurpose"> — Parse JSON data streams</span>
</dt>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Generator</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="json-streams.html" title="Part III. Reading and writing">
<link rel="prev" href="JsonPath.html" title="JsonPath">
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id442019"></a>Generator</h2></div></div></div>
-<div class="toc"><dl>
+<a name="id-1.4.4"></a>Generator</h2></div></div></div>
+<div class="toc"><dl class="toc">
<dt>
<span class="refentrytitle"><a href="JsonGenerator.html">JsonGenerator</a></span><span class="refpurpose"> — Generates JSON data streams</span>
</dt>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Object Hierarchy</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
<link rel="prev" href="json-glib-Versioning-information.html" title="Versioning information">
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id472249"></a>Object Hierarchy</h2></div></div></div>
+<a name="id-1.6.3"></a>Object Hierarchy</h2></div></div></div>
<pre class="screen">
GObject
<a class="link" href="JsonBuilder.html" title="JsonBuilder">JsonBuilder</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSON-GLib Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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.18.1 (XML mode)">
<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 0.15.2
+<div><p class="releaseinfo">for JSON-GLib 0.16.0
</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">
-<a name="id
442387"></a><p>
+<a name="id
-1.1.5"></a><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
</div>
<hr>
</div>
-<div class="toc"><dl>
+<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-base.html">II. JSON-GLib Reference</a></span></dt>
<dd><dl>
<ANCHOR id="JSON-NODE-HOLDS-OBJECT:CAPS" href="json-glib/json-glib-JSON-Node.html#JSON-NODE-HOLDS-OBJECT:CAPS">
<ANCHOR id="JSON-NODE-HOLDS-ARRAY:CAPS" href="json-glib/json-glib-JSON-Node.html#JSON-NODE-HOLDS-ARRAY:CAPS">
<ANCHOR id="JSON-NODE-HOLDS-NULL:CAPS" href="json-glib/json-glib-JSON-Node.html#JSON-NODE-HOLDS-NULL:CAPS">
+<ANCHOR id="json-node-alloc" href="json-glib/json-glib-JSON-Node.html#json-node-alloc">
+<ANCHOR id="json-node-init" href="json-glib/json-glib-JSON-Node.html#json-node-init">
+<ANCHOR id="json-node-init-int" href="json-glib/json-glib-JSON-Node.html#json-node-init-int">
+<ANCHOR id="json-node-init-double" href="json-glib/json-glib-JSON-Node.html#json-node-init-double">
+<ANCHOR id="json-node-init-boolean" href="json-glib/json-glib-JSON-Node.html#json-node-init-boolean">
+<ANCHOR id="json-node-init-string" href="json-glib/json-glib-JSON-Node.html#json-node-init-string">
+<ANCHOR id="json-node-init-null" href="json-glib/json-glib-JSON-Node.html#json-node-init-null">
+<ANCHOR id="json-node-init-object" href="json-glib/json-glib-JSON-Node.html#json-node-init-object">
+<ANCHOR id="json-node-init-array" href="json-glib/json-glib-JSON-Node.html#json-node-init-array">
<ANCHOR id="json-node-new" href="json-glib/json-glib-JSON-Node.html#json-node-new">
<ANCHOR id="json-node-copy" href="json-glib/json-glib-JSON-Node.html#json-node-copy">
<ANCHOR id="json-node-free" href="json-glib/json-glib-JSON-Node.html#json-node-free">
<ANCHOR id="JSON-PARSER-ERROR-MISSING-COMMA:CAPS" href="json-glib/JsonParser.html#JSON-PARSER-ERROR-MISSING-COMMA:CAPS">
<ANCHOR id="JSON-PARSER-ERROR-MISSING-COLON:CAPS" href="json-glib/JsonParser.html#JSON-PARSER-ERROR-MISSING-COLON:CAPS">
<ANCHOR id="JSON-PARSER-ERROR-INVALID-BAREWORD:CAPS" href="json-glib/JsonParser.html#JSON-PARSER-ERROR-INVALID-BAREWORD:CAPS">
+<ANCHOR id="JSON-PARSER-ERROR-EMPTY-MEMBER-NAME:CAPS" href="json-glib/JsonParser.html#JSON-PARSER-ERROR-EMPTY-MEMBER-NAME:CAPS">
<ANCHOR id="JSON-PARSER-ERROR-UNKNOWN:CAPS" href="json-glib/JsonParser.html#JSON-PARSER-ERROR-UNKNOWN:CAPS">
<ANCHOR id="JsonParser-struct" href="json-glib/JsonParser.html#JsonParser-struct">
<ANCHOR id="JsonParserClass" href="json-glib/JsonParser.html#JsonParserClass">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ch04.html" title="Object Hierarchy">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id472261"></a>Index</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.7"></a>Index</h1></div></div></div>
<a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
<dt>
<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a>, struct in <a class="link" href="json-glib-JSON-Array.html" title="JSON Array">JSON Array</a>
</dt>
<dd></dd>
<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-alloc" title="json_node_alloc ()">json_node_alloc</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="json-glib-JSON-Node.html#json-node-copy" title="json_node_copy ()">json_node_copy</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
</dt>
<dd></dd>
</dt>
<dd></dd>
<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init" title="json_node_init ()">json_node_init</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init-array" title="json_node_init_array ()">json_node_init_array</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init-boolean" title="json_node_init_boolean ()">json_node_init_boolean</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init-double" title="json_node_init_double ()">json_node_init_double</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init-int" title="json_node_init_int ()">json_node_init_int</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init-null" title="json_node_init_null ()">json_node_init_null</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init-object" title="json_node_init_object ()">json_node_init_object</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="json-glib-JSON-Node.html#json-node-init-string" title="json_node_init_string ()">json_node_init_string</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
+</dt>
+<dd></dd>
+<dt>
<a class="link" href="json-glib-JSON-Node.html#json-node-is-null" title="json_node_is_null ()">json_node_is_null</a>, function in <a class="link" href="json-glib-JSON-Node.html" title="JSON Node">JSON Node</a>
</dt>
<dd></dd>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of deprecated symbols</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix01.html" title="Index">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id472274"></a>Index of deprecated symbols</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.8"></a>Index of deprecated symbols</h1></div></div></div>
<a name="idx"></a><a name="idxC"></a><h3 class="title">C</h3>
<dt>
<a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a>, function in <a class="link" href="json-glib-GObject-Serialization.html" title="GObject Serialization">GObject Serialization</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.4</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix02.html" title="Index of deprecated symbols">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id472288"></a>Index of new symbols in 0.4</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.9"></a>Index of new symbols in 0.4</h1></div></div></div>
<a name="idx"></a><a name="idxC"></a><h3 class="title">C</h3>
<dt>
<a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a>, function in <a class="link" href="json-glib-GObject-Serialization.html" title="GObject Serialization">GObject Serialization</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.6</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix03.html" title="Index of new symbols in 0.4">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id472303"></a>Index of new symbols in 0.6</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.10"></a>Index of new symbols in 0.6</h1></div></div></div>
<a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
<dt>
<a class="link" href="json-glib-JSON-Array.html#json-array-dup-element" title="json_array_dup_element ()">json_array_dup_element</a>, function in <a class="link" href="json-glib-JSON-Array.html" title="JSON Array">JSON Array</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.8</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix04.html" title="Index of new symbols in 0.6">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id472318"></a>Index of new symbols in 0.8</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.11"></a>Index of new symbols in 0.8</h1></div></div></div>
<a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
<dt>
<a class="link" href="json-glib-JSON-Array.html#JsonArrayForeach" title="JsonArrayForeach ()">JsonArrayForeach</a>, user_function in <a class="link" href="json-glib-JSON-Array.html" title="JSON Array">JSON Array</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.10</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix05.html" title="Index of new symbols in 0.8">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id472332"></a>Index of new symbols in 0.10</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.12"></a>Index of new symbols in 0.10</h1></div></div></div>
<a name="idx"></a><a name="idxB"></a><h3 class="title">B</h3>
<dt>
<a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()">JsonBoxedDeserializeFunc</a>, user_function in <a class="link" href="json-glib-Boxed-Types-Serialization.html" title="Boxed Types Serialization">Boxed Types Serialization</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.12</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix06.html" title="Index of new symbols in 0.10">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id472347"></a>Index of new symbols in 0.12</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.13"></a>Index of new symbols in 0.12</h1></div></div></div>
<a name="idx"></a><a name="idxB"></a><h3 class="title">B</h3>
<dt>
<a class="link" href="JsonBuilder.html#JsonBuilder-struct" title="struct JsonBuilder">JsonBuilder</a>, struct in <a class="link" href="JsonBuilder.html" title="JsonBuilder">JsonBuilder</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.14</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ix07.html" title="Index of new symbols in 0.12">
</td></tr>
</table>
<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id441709"></a>Index of new symbols in 0.14</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.14"></a>Index of new symbols in 0.14</h1></div></div></div>
<a name="idx"></a><a name="idxG"></a><h3 class="title">G</h3>
<dt>
<a class="link" href="JsonGenerator.html#json-generator-get-indent" title="json_generator_get_indent ()">json_generator_get_indent</a>, function in <a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Part IV. JSON-GLib Advanced API</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="JsonBuilder.html" title="JsonBuilder">
<a name="json-advanced"></a>Part IV. JSON-GLib Advanced API</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
<dt>
<span class="refentrytitle"><a href="json-glib-GObject-Serialization.html">GObject Serialization</a></span><span class="refpurpose"> — Serialize and deserialize GObjects</span>
</dt>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Part II. JSON-GLib Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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">
</p>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
<dt><span class="chapter"><a href="ch01.html">Data Types</a></span></dt>
<dd><dl>
<dt>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Boxed Types Serialization</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<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">
<p>
Serializes the passed <span class="type">GBoxed</span> and stores it inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>boxed</code></em> :</span></p></td>
<p>
Deserializes the contents of the passed <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> into a <span class="type">GBoxed</span>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
Registers a serialization function for a <span class="type">GBoxed</span> of type <em class="parameter"><code>gboxed_type</code></em>
to a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> of type <em class="parameter"><code>node_type</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
Registers a deserialization function for a <span class="type">GBoxed</span> of type <em class="parameter"><code>gboxed_type</code></em>
from a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> of type <em class="parameter"><code>node_type</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
Checks whether it is possible to deserialize a <span class="type">GBoxed</span> of
type <em class="parameter"><code>gboxed_type</code></em> from a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> of type <em class="parameter"><code>node_type</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
Serializes <em class="parameter"><code>boxed</code></em>, a pointer to a <span class="type">GBoxed</span> of type <em class="parameter"><code>gboxed_type</code></em>,
into a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
<p>
Deserializes <em class="parameter"><code>node</code></em> into a <span class="type">GBoxed</span> of <em class="parameter"><code>gboxed_type</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>GObject Serialization</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<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">
instance. Each member of the returned JSON object will
map to a property of the <span class="type">GObject</span>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gobject</code></em> :</span></p></td>
Creates a new <span class="type">GObject</span> 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" title="JsonObject"><span class="type">JsonObject</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
implementation will be use to translate the compatible types into
JSON native types.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gobject</code></em> :</span></p></td>
<p>
Note: the JSON data stream must be an object declaration.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
<p>
Note: the JSON data stream must be an object declaration.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
its properties; otherwise, the default implementation will be use to
translate the compatible types into JSON native types.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gobject</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSON Array</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch01.html" title="Data Types">
<link rel="prev" href="json-glib-JSON-Node.html" title="JSON Node">
<p>
Creates a new <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>the newly created <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>
<p>
Creates a new <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> with <em class="parameter"><code>n_elements</code></em> slots already allocated.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>n_elements</code></em> :</span></p></td>
<p>
Increase by one the reference count of a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
reference count reaches zero, the array is destroyed and all
its allocated resources are freed.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>
Appends <em class="parameter"><code>node</code></em> inside <em class="parameter"><code>array</code></em>. The array will take ownership of the
<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
Retrieves the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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" title="JsonArray"><span class="type">JsonArray</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
Retrieves a copy of the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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" title="JsonArray"><span class="type">JsonArray</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
Gets the elements of a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> as a list of <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>s.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
Retrieves the length of a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
Removes the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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
resources.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
should not add or remove elements to and from <em class="parameter"><code>array</code></em> within
this function. It is safe to change the value of <em class="parameter"><code>element_node</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
from within the iterator <em class="parameter"><code>func</code></em>, but it is not safe to add or
remove elements from the <em class="parameter"><code>array</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()"><code class="function">json_array_add_element()</code></a>, <a class="link" href="json-glib-JSON-Node.html#json-node-take-array" title="json_node_take_array ()"><code class="function">json_node_take_array()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+<td>a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
</td>
</tr>
</tbody>
<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-get-array" title="json_node_get_array ()"><code class="function">json_node_get_array()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()"><code class="function">json_array_add_element()</code></a>, <a class="link" href="json-glib-JSON-Node.html#json-node-set-boolean" title="json_node_set_boolean ()"><code class="function">json_node_set_boolean()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<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-get-boolean" title="json_node_get_boolean ()"><code class="function">json_node_get_boolean()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()"><code class="function">json_array_add_element()</code></a>, <a class="link" href="json-glib-JSON-Node.html#json-node-set-double" title="json_node_set_double ()"><code class="function">json_node_set_double()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<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-get-double" title="json_node_get_double ()"><code class="function">json_node_get_double()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()"><code class="function">json_array_add_element()</code></a>, <a class="link" href="json-glib-JSON-Node.html#json-node-set-int" title="json_node_set_int ()"><code class="function">json_node_set_int()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<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-get-int" title="json_node_get_int ()"><code class="function">json_node_get_int()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()"><code class="function">json_array_add_element()</code></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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>
<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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()"><code class="function">json_array_add_element()</code></a>, <a class="link" href="json-glib-JSON-Node.html#json-node-take-object" title="json_node_take_object ()"><code class="function">json_node_take_object()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<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-get-object" title="json_node_get_object ()"><code class="function">json_node_get_object()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()"><code class="function">json_array_add_element()</code></a>, <a class="link" href="json-glib-JSON-Node.html#json-node-set-string" title="json_node_set_string ()"><code class="function">json_node_set_string()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<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-get-string" title="json_node_get_string ()"><code class="function">json_node_get_string()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSON GVariant Integration</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<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">
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" title="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
methods in order to obtain a correct, type-contrained result.
<p>
</p>
<div class="table">
-<a name="id
549765"></a><p class="title"><b>Table 2. Default JSON to GVariant conversion (without signature constrains)</b></p>
+<a name="id
-1.5.5.4.5.1"></a><p class="title"><b>Table 2. Default JSON to GVariant conversion (without signature constrains)</b></p>
<div class="table-contents"><table summary="Default JSON to GVariant conversion (without signature constrains)" border="1">
<colgroup>
<col>
<p>
Converts <em class="parameter"><code>variant</code></em> to a JSON tree.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>variant</code></em> :</span></p></td>
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
JSON tree, and then <a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a> to stringify it.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>variant</code></em> :</span></p></td>
If <em class="parameter"><code>signature</code></em> is <code class="literal">NULL</code>, the conversion is done based strictly on the types
in the JSON nodes.
</p>
-<div class="variablelist"><table border="0">
+<p>
+The returned variant has a floating reference that will need to be sunk
+by the caller code.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>json_node</code></em> :</span></p></td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A newly created <span class="type">GVariant</span> compliant with
-<em class="parameter"><code>signature</code></em>, or <code class="literal">NULL</code> on error. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+<td>A newly created, floating <span class="type">GVariant</span>
+compliant with <em class="parameter"><code>signature</code></em>, or <code class="literal">NULL</code> on error. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
</td>
</tr>
</tbody>
The string is first converted to a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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>
-<div class="variablelist"><table border="0">
+<p>
+The returned variant has a floating reference that will need to be sunk
+by the caller code.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>json</code></em> :</span></p></td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A newly created <span class="type">GVariant</span> compliant with
-<em class="parameter"><code>signature</code></em>, or <code class="literal">NULL</code> on error. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+<td>A newly created, floating <span class="type">GVariant</span> compliant
+with <em class="parameter"><code>signature</code></em>, or <code class="literal">NULL</code> on error. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
</td>
</tr>
</tbody>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSON Node</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch01.html" title="Data Types">
<link rel="prev" href="ch01.html" title="Data Types">
#define <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-OBJECT:CAPS" title="JSON_NODE_HOLDS_OBJECT()">JSON_NODE_HOLDS_OBJECT</a> (node)
#define <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-ARRAY:CAPS" title="JSON_NODE_HOLDS_ARRAY()">JSON_NODE_HOLDS_ARRAY</a> (node)
#define <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-NULL:CAPS" title="JSON_NODE_HOLDS_NULL()">JSON_NODE_HOLDS_NULL</a> (node)
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-alloc" title="json_node_alloc ()">json_node_alloc</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init" title="json_node_init ()">json_node_init</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</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> type</code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init-int" title="json_node_init_int ()">json_node_init_int</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><span class="type">gint64</span> value</code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init-double" title="json_node_init_double ()">json_node_init_double</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><span class="type">gdouble</span> value</code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init-boolean" title="json_node_init_boolean ()">json_node_init_boolean</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init-string" title="json_node_init_string ()">json_node_init_string</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init-null" title="json_node_init_null ()">json_node_init_null</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init-object" title="json_node_init_object ()">json_node_init_object</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> *object</code></em>);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-init-array" title="json_node_init_array ()">json_node_init_array</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> *array</code></em>);
<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-new" title="json_node_new ()">json_node_new</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> type</code></em>);
<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * <a class="link" href="json-glib-JSON-Node.html#json-node-copy" title="json_node_copy ()">json_node_copy</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);
<span class="returnvalue">void</span> <a class="link" href="json-glib-JSON-Node.html#json-node-free" title="json_node_free ()">json_node_free</a> (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);
<p>
Indicates the content of a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><a name="JSON-NODE-OBJECT:CAPS"></a><span class="term"><code class="literal">JSON_NODE_OBJECT</code></span></p></td>
<p>
Evaluates to the <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> contained by <em class="parameter"><code>node</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
<p>
Evaluates to <code class="literal">TRUE</code> if the <em class="parameter"><code>node</code></em> holds type <em class="parameter"><code>t</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Evaluates to <code class="literal">TRUE</code> 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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
<p>
Evaluates to <code class="literal">TRUE</code> 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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
<p>
Evaluates to <code class="literal">TRUE</code> 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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
<p>
Evaluates to <code class="literal">TRUE</code> 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="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</div>
<hr>
<div class="refsect2">
+<a name="json-node-alloc"></a><h3>json_node_alloc ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * json_node_alloc (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Allocates a new <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. Use <a class="link" href="json-glib-JSON-Node.html#json-node-init" title="json_node_init ()"><code class="function">json_node_init()</code></a> and its variants
+to initialize the returned value.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the newly allocated <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. Use
+<a class="link" href="json-glib-JSON-Node.html#json-node-free" title="json_node_free ()"><code class="function">json_node_free()</code></a> to free the resources allocated by this function. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="json-node-init"></a><h3>json_node_init ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * json_node_init (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</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> type</code></em>);</pre>
+<p>
+Initializes a <em class="parameter"><code>node</code></em> to a specific <em class="parameter"><code>type</code></em>.
+</p>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
+<td>the type of JSON node to initialize <em class="parameter"><code>node</code></em> to</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<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" title="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" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><span class="type">gint64</span> 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>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>an integer</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<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" title="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" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><span class="type">gdouble</span> 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>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a floating point value</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<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" title="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" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><span class="type">gboolean</span> 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>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a boolean value</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="json-node-init-string"></a><h3>json_node_init_string ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * json_node_init_string (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code>const <span class="type">char</span> *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>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a string value. <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><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="json-node-init-null"></a><h3>json_node_init_null ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * json_node_init_null (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>);</pre>
+<p>
+Initializes <em class="parameter"><code>node</code></em> to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL:CAPS"><code class="literal">JSON_NODE_NULL</code></a>.
+</p>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="json-node-init-object"></a><h3>json_node_init_object ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * json_node_init_object (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> *object</code></em>);</pre>
+<p>
+Initializes <em class="parameter"><code>node</code></em> to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-OBJECT:CAPS"><code class="literal">JSON_NODE_OBJECT</code></a> and sets <em class="parameter"><code>object</code></em> into it.
+</p>
+<p>
+This function will take a reference on <em class="parameter"><code>object</code></em>.
+</p>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> to initialize <em class="parameter"><code>node</code></em> with, or <code class="literal">NULL</code>. <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><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="json-node-init-array"></a><h3>json_node_init_array ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * json_node_init_array (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> *node</code></em>,
+ <em class="parameter"><code><a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> *array</code></em>);</pre>
+<p>
+Initializes <em class="parameter"><code>node</code></em> to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-ARRAY:CAPS"><code class="literal">JSON_NODE_ARRAY</code></a> and sets <em class="parameter"><code>array</code></em> into it.
+</p>
+<p>
+This function will take a reference on <em class="parameter"><code>array</code></em>.
+</p>
+<p>
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> to initialize</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>array</code></em> :</span></p></td>
+<td>the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> to initialize <em class="parameter"><code>node</code></em> with, or <code class="literal">NULL</code>. <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><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the initialized <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
+<div class="refsect2">
<a name="json-node-new"></a><h3>json_node_new ()</h3>
<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="returnvalue">JsonNode</span></a> * json_node_new (<em class="parameter"><code><a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> type</code></em>);</pre>
<p>
Creates a new <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> of <em class="parameter"><code>type</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<p>
+This is a convenience function for <a class="link" href="json-glib-JSON-Node.html#json-node-alloc" title="json_node_alloc ()"><code class="function">json_node_alloc()</code></a> and <a class="link" href="json-glib-JSON-Node.html#json-node-init" title="json_node_init ()"><code class="function">json_node_init()</code></a>,
+and it's the equivalent of:
+</p>
+<p>
+</p>
+<div class="informalexample">
+ <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="listing_lines" align="right"><pre>1</pre></td>
+ <td class="listing_code"><pre class="programlisting"><span class="keyword">return</span><span class="normal"> </span><span class="function"><a href="json-glib-JSON-Node.html#json-node-init">json_node_init</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="json-glib-JSON-Node.html#json-node-alloc">json_node_alloc</a></span><span class="normal"> </span><span class="symbol">(),</span><span class="normal"> type</span><span class="symbol">);</span></pre></td>
+ </tr>
+ </tbody>
+ </table>
+</div>
+
+<p>
+</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
Copies <em class="parameter"><code>node</code></em>. If the node contains complex data types then the reference
count of the objects is increased.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Frees the resources allocated by <em class="parameter"><code>node</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
<p>
Sets <em class="parameter"><code>array</code></em> inside <em class="parameter"><code>node</code></em> and increases the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> reference count
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> initialized to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-ARRAY:CAPS"><code class="literal">JSON_NODE_ARRAY</code></a>
</td>
</tr>
<tr>
<p>
Sets <em class="parameter"><code>array</code></em> into <em class="parameter"><code>node</code></em> without increasing the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> reference count.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> initialized to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-ARRAY:CAPS"><code class="literal">JSON_NODE_ARRAY</code></a>
</td>
</tr>
<tr>
<p>
Retrieves the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
Retrieves the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> and returns it
with its reference count increased by one.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Sets <em class="parameter"><code>objects</code></em> inside <em class="parameter"><code>node</code></em>. The reference count of <em class="parameter"><code>object</code></em> is increased.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> initialized to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-OBJECT:CAPS"><code class="literal">JSON_NODE_OBJECT</code></a>
</td>
</tr>
<tr>
<p>
Sets <em class="parameter"><code>object</code></em> inside <em class="parameter"><code>node</code></em>. The reference count of <em class="parameter"><code>object</code></em> is not increased.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> initialized to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-OBJECT:CAPS"><code class="literal">JSON_NODE_OBJECT</code></a>
</td>
</tr>
<tr>
<p>
Retrieves the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
Retrieves the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> inside <em class="parameter"><code>node</code></em>. The reference count of
the returned object is increased.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<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" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> initialized to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE:CAPS"><code class="literal">JSON_NODE_VALUE</code></a>
</td>
</tr>
<tr>
Retrieves a value from a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
Sets <em class="parameter"><code>value</code></em> as the boolean content of the <em class="parameter"><code>node</code></em>, replacing any existing
content.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Gets the boolean value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
Sets <em class="parameter"><code>value</code></em> as the double content of the <em class="parameter"><code>node</code></em>, replacing any existing
content.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Gets the double value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
Sets <em class="parameter"><code>value</code></em> as the integer content of the <em class="parameter"><code>node</code></em>, replacing any existing
content.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Gets the integer value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
Sets <em class="parameter"><code>value</code></em> as the string content of the <em class="parameter"><code>node</code></em>, replacing any existing
content.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
of type <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE:CAPS"><code class="literal">JSON_NODE_VALUE</code></a>
+<td>a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
initialized to <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE:CAPS"><code class="literal">JSON_NODE_VALUE</code></a>
</td>
</tr>
<tr>
<p>
Gets the string value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Gets a copy of the string value stored inside a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Sets the parent <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> of <em class="parameter"><code>node</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Retrieves the parent <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> of <em class="parameter"><code>node</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Retrieves the user readable name of the data type contained by <em class="parameter"><code>node</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Returns the <span class="type">GType</span> of the payload of the node.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<p>
Retrieves the <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> of <em class="parameter"><code>node</code></em>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
</div>
<p>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSON Object</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<link rel="up" href="ch01.html" title="Data Types">
<link rel="prev" href="json-glib-JSON-Array.html" title="JSON Array">
<p>
Creates a new <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>, an JSON object type representation.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>the newly created <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>
<p>
Increase by one the reference count of a <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
reference count reaches zero, the object is destroyed and all
its allocated resources are freed.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<td>a <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>
This function will return if the <em class="parameter"><code>object</code></em> already contains a member
<em class="parameter"><code>member_name</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
the member's current value is overwritten. Otherwise, a new
member is added to <em class="parameter"><code>object</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
Checks whether <em class="parameter"><code>object</code></em> has a member named <em class="parameter"><code>member_name</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
Retrieves the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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" title="JsonObject"><span class="type">JsonObject</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
Retrieves a copy of the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="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" title="JsonObject"><span class="type">JsonObject</span></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
Retrieves all the names of the members of a <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
Retrieves all the values of the members of a <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
Retrieves the number of members of a <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
Removes <em class="parameter"><code>member_name</code></em> from <em class="parameter"><code>object</code></em>, freeing its allocated resources.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
should not add or remove members to and from <em class="parameter"><code>object</code></em> within
this function. It is safe to change the value of <em class="parameter"><code>member_node</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
from within the iterator <em class="parameter"><code>func</code></em>, but it is not safe to add or
remove members from the <em class="parameter"><code>object</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()"><code class="function">json_object_set_member()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()"><code class="function">json_object_set_member()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()"><code class="function">json_object_set_member()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()"><code class="function">json_object_set_member()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()"><code class="function">json_object_set_member()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()"><code class="function">json_object_set_member()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()"><code class="function">json_object_set_member()</code></a>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<p>
See also: <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>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Serializable Interface</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<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">
so it can also be used to override the default property serialization
sequence.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="structfield"><code><a name="JsonSerializableIface.serialize-property"></a>serialize_property</code></em> ()</span></p></td>
Asks a <span class="type">JsonSerializable</span> implementation to serialize a <span class="type">GObject</span>
property into a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> object.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
Asks a <span class="type">JsonSerializable</span> implementation to deserialize the
property contained inside <em class="parameter"><code>property_node</code></em> into <em class="parameter"><code>value</code></em>.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
<p>
FIXME
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
<p>
FIXME
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
<p>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
<p>
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Versioning information</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
<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">
<hr>
<div class="refsect2">
<a name="JSON-MINOR-VERSION:CAPS"></a><h3>JSON_MINOR_VERSION</h3>
-<pre class="programlisting">#define JSON_MINOR_VERSION (15)
+<pre class="programlisting">#define JSON_MINOR_VERSION (16)
</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)
<hr>
<div class="refsect2">
<a name="JSON-MICRO-VERSION:CAPS"></a><h3>JSON_MICRO_VERSION</h3>
-<pre class="programlisting">#define JSON_MICRO_VERSION (2)
+<pre class="programlisting">#define JSON_MICRO_VERSION (0)
</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)
<hr>
<div class="refsect2">
<a name="JSON-VERSION:CAPS"></a><h3>JSON_VERSION</h3>
-<pre class="programlisting">#define JSON_VERSION (0.15.2)
+<pre class="programlisting">#define JSON_VERSION (0.16.0)
</pre>
<p>
Json version.
<hr>
<div class="refsect2">
<a name="JSON-VERSION-S:CAPS"></a><h3>JSON_VERSION_S</h3>
-<pre class="programlisting">#define JSON_VERSION_S "0.15.2"
+<pre class="programlisting">#define JSON_VERSION_S "0.16.0"
</pre>
<p>
Json version, encoded as a string, useful for printing and
Compile-time version checking. Evaluates to <code class="literal">TRUE</code> if the version
of Json is greater than the required one.
</p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
<col align="left" valign="top">
+<col>
+</colgroup>
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>major</code></em> :</span></p></td>
<keyword type="macro" name="JSON_NODE_HOLDS_OBJECT()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-OBJECT:CAPS" since="0.10"/>
<keyword type="macro" name="JSON_NODE_HOLDS_ARRAY()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-ARRAY:CAPS" since="0.10"/>
<keyword type="macro" name="JSON_NODE_HOLDS_NULL()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-NULL:CAPS" since="0.10"/>
+ <keyword type="function" name="json_node_alloc ()" link="json-glib-JSON-Node.html#json-node-alloc" since="0.16"/>
+ <keyword type="function" name="json_node_init ()" link="json-glib-JSON-Node.html#json-node-init" since="0.16"/>
+ <keyword type="function" name="json_node_init_int ()" link="json-glib-JSON-Node.html#json-node-init-int" since="0.16"/>
+ <keyword type="function" name="json_node_init_double ()" link="json-glib-JSON-Node.html#json-node-init-double" since="0.16"/>
+ <keyword type="function" name="json_node_init_boolean ()" link="json-glib-JSON-Node.html#json-node-init-boolean" since="0.16"/>
+ <keyword type="function" name="json_node_init_string ()" link="json-glib-JSON-Node.html#json-node-init-string" since="0.16"/>
+ <keyword type="function" name="json_node_init_null ()" link="json-glib-JSON-Node.html#json-node-init-null" since="0.16"/>
+ <keyword type="function" name="json_node_init_object ()" link="json-glib-JSON-Node.html#json-node-init-object" since="0.16"/>
+ <keyword type="function" name="json_node_init_array ()" link="json-glib-JSON-Node.html#json-node-init-array" since="0.16"/>
<keyword type="function" name="json_node_new ()" link="json-glib-JSON-Node.html#json-node-new"/>
<keyword type="function" name="json_node_copy ()" link="json-glib-JSON-Node.html#json-node-copy"/>
<keyword type="function" name="json_node_free ()" link="json-glib-JSON-Node.html#json-node-free"/>
<keyword type="constant" name="JSON_PARSER_ERROR_MISSING_COMMA" link="JsonParser.html#JSON-PARSER-ERROR-MISSING-COMMA:CAPS"/>
<keyword type="constant" name="JSON_PARSER_ERROR_MISSING_COLON" link="JsonParser.html#JSON-PARSER-ERROR-MISSING-COLON:CAPS"/>
<keyword type="constant" name="JSON_PARSER_ERROR_INVALID_BAREWORD" link="JsonParser.html#JSON-PARSER-ERROR-INVALID-BAREWORD:CAPS"/>
+ <keyword type="constant" name="JSON_PARSER_ERROR_EMPTY_MEMBER_NAME" link="JsonParser.html#JSON-PARSER-ERROR-EMPTY-MEMBER-NAME:CAPS"/>
<keyword type="constant" name="JSON_PARSER_ERROR_UNKNOWN" link="JsonParser.html#JSON-PARSER-ERROR-UNKNOWN:CAPS"/>
<keyword type="constant" name="JSON_READER_ERROR_NO_ARRAY" link="JsonReader.html#JSON-READER-ERROR-NO-ARRAY:CAPS"/>
<keyword type="constant" name="JSON_READER_ERROR_INVALID_INDEX" link="JsonReader.html#JSON-READER-ERROR-INVALID-INDEX:CAPS"/>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Part I. JSON-GLib Overview</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="index.html" title="JSON-GLib Reference Manual">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Part III. Reading and writing</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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-JSON-Object.html" title="JSON Object">
</p>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
<dt><span class="chapter"><a href="ch02.html">Parser</a></span></dt>
<dd><dl>
<dt>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Part V. JSON-GLib Additional Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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-JSON-GVariant-Integration.html" title="JSON GVariant Integration">
<a name="json-tools"></a>Part V. JSON-GLib Additional Reference</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
<dt>
<span class="refentrytitle"><a href="json-glib-Versioning-information.html">Versioning information</a></span><span class="refpurpose"> — JSON-GLib version checking</span>
</dt>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Appendix A. License</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.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="annotation-glossary.html" title="Annotation Glossary">
<td> </td>
</tr></table>
<div class="appendix">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="license"></a>Appendix A. License</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="license"></a>Appendix A. License</h1></div></div></div>
<p>
This library is free software; you can redistribute it and/or
modify it under the terms of the <em class="citetitle">GNU Library General
<xi:include href="xml/api-index-0.14.xml"><xi:fallback/></xi:include>
</index>
- <xi:include href="xml/annotation-glossary.xml"/>
+ <xi:include href="xml/annotation-glossary.xml"><xi:fallback/></xi:include>
<appendix id="license">
<title>License</title>
JSON_NODE_HOLDS_OBJECT
JSON_NODE_HOLDS_ARRAY
JSON_NODE_HOLDS_NULL
+json_node_alloc
+json_node_init
+json_node_init_int
+json_node_init_double
+json_node_init_boolean
+json_node_init_string
+json_node_init_null
+json_node_init_object
+json_node_init_array
json_node_new
json_node_copy
json_node_free
#### 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";
+
setup-build.stamp:
- -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- echo ' DOC Preparing build'; \
+ -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
done; \
fi; \
fi
- @touch setup-build.stamp
+ $(AM_V_at)touch setup-build.stamp
#### 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";
+
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo ' DOC Scanning header files'
- @_source_dir='' ; \
+ $(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)
- @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- echo " DOC Introspecting gobjects"; \
+ $(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 \
test -f $$i || touch $$i ; \
done \
fi
- @touch scan-build.stamp
+ $(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
#### 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";
+
sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
- @echo ' DOC Building XML'
- @_source_dir='' ; \
+ $(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)
- @touch sgml-build.stamp
+ $(AM_V_at)touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
#### 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";
+
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo ' DOC Building HTML'
- @rm -rf html
- @mkdir html
- @mkhtml_options=""; \
+ $(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 \
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
done;
- @echo ' DOC Fixing cross-references'
- @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- @touch html-build.stamp
+ $(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 ####
+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";
+
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo ' DOC Building PDF'
- @rm -f $(DOC_MODULE).pdf
- @mkpdf_options=""; \
+ $(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 \
done; \
fi; \
gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
- @touch pdf-build.stamp
+ $(AM_V_at)touch pdf-build.stamp
##############
xmlns="http://www.gtk.org/introspection/core/1.0"
xmlns:c="http://www.gtk.org/introspection/c/1.0"
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
- <include name="GLib" version="2.0"/>
<include name="GObject" version="2.0"/>
<include name="Gio" version="2.0"/>
<package name="json-glib-1.0"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
- <parameter name="value" transfer-ownership="full">
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
+ <parameter name="value" transfer-ownership="full" allow-none="1">
<doc xml:whitespace="preserve">a #JsonArray</doc>
<type name="Array" c:type="JsonArray*"/>
</parameter>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">a boolean value</doc>
<type name="gboolean" c:type="gboolean"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">a floating point value</doc>
<type name="gdouble" c:type="gdouble"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="node" transfer-ownership="full">
<doc xml:whitespace="preserve">a #JsonNode</doc>
<type name="Node" c:type="JsonNode*"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">an integer value</doc>
<type name="gint64" c:type="gint64"/>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="add_object_element"
c:identifier="json_array_add_object_element"
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="full">
<doc xml:whitespace="preserve">a #JsonObject</doc>
<type name="Object" c:type="JsonObject*"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">a string value</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="func"
transfer-ownership="none"
scope="call"
<type name="Array" c:type="JsonArray*"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<type name="gdouble" c:type="gdouble"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<type name="Node"/>
</type>
</return-value>
+ <parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_int_element"
c:identifier="json_array_get_int_element"
<type name="gint64" c:type="gint64"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<doc xml:whitespace="preserve">the length of the array</doc>
<type name="guint" c:type="guint"/>
</return-value>
+ <parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_null_element"
c:identifier="json_array_get_null_element"
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<type name="Object" c:type="JsonObject*"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
See also: json_array_get_element(), json_node_get_string()</doc>
<return-value transfer-ownership="none">
<doc xml:whitespace="preserve">the string value; the returned string is owned by the #JsonArray and should not be modified or freed</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element to retrieve</doc>
<type name="guint" c:type="guint"/>
<doc xml:whitespace="preserve">the passed #JsonArray, with the reference count increased by one.</doc>
<type name="Array" c:type="JsonArray*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="remove_element" c:identifier="json_array_remove_element">
<doc xml:whitespace="preserve">Removes the #JsonNode inside @array at @index_ freeing its allocated
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the position of the element to be removed</doc>
<type name="guint" c:type="guint"/>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="array" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonArray</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </instance-parameter>
+ </parameters>
</method>
</record>
<callback name="ArrayForeach" c:type="JsonArrayForeach" version="0.8">
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
<parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member or element</doc>
<type name="gboolean" c:type="gboolean"/>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
<parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member or element</doc>
<type name="gdouble" c:type="gdouble"/>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
<parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member or element</doc>
<type name="gint64" c:type="gint64"/>
<doc xml:whitespace="preserve">the #JsonBuilder, or %NULL if the call was inconsistent</doc>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="add_string_value"
c:identifier="json_builder_add_string_value">
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
<parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member or element</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
<parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
<parameter name="node" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member or element</doc>
<type name="Node" c:type="JsonNode*"/>
<doc xml:whitespace="preserve">the #JsonBuilder, or %NULL if the call was inconsistent</doc>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="begin_object" c:identifier="json_builder_begin_object">
<doc xml:whitespace="preserve">Opens a subobject inside the given @builder. When done adding members to
<doc xml:whitespace="preserve">the #JsonBuilder, or %NULL if the call was inconsistent</doc>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="end_array" c:identifier="json_builder_end_array">
<doc xml:whitespace="preserve">Closes the subarray inside the given @builder that was opened by the most
<doc xml:whitespace="preserve">the #JsonBuilder, or %NULL if the call was inconsistent</doc>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="end_object" c:identifier="json_builder_end_object">
<doc xml:whitespace="preserve">Closes the subobject inside the given @builder that was opened by the most
<doc xml:whitespace="preserve">the #JsonBuilder, or %NULL if the call was inconsistent</doc>
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_root" c:identifier="json_builder_get_root">
<doc xml:whitespace="preserve">Returns the root of the current constructed tree, if the build is complete
<doc xml:whitespace="preserve">the #JsonNode, or %NULL if the build is not complete. Free the returned value with json_node_free().</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="reset" c:identifier="json_builder_reset">
<doc xml:whitespace="preserve">Resets the state of the @builder back to its initial state.</doc>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="set_member_name"
c:identifier="json_builder_set_member_name">
<type name="Builder" c:type="JsonBuilder*"/>
</return-value>
<parameters>
+ <instance-parameter name="builder" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonBuilder</doc>
+ <type name="Builder" c:type="JsonBuilder*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<doc xml:whitespace="preserve">the number of repetitions per indentation level</doc>
<type name="guint" c:type="guint"/>
</return-value>
+ <parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_indent_char"
c:identifier="json_generator_get_indent_char"
<doc xml:whitespace="preserve">the character to be used when indenting</doc>
<type name="gunichar" c:type="gunichar"/>
</return-value>
+ <parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_pretty"
c:identifier="json_generator_get_pretty"
<doc xml:whitespace="preserve">%TRUE if the generated JSON should be pretty-printed, and %FALSE otherwise</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_root"
c:identifier="json_generator_get_root"
<doc xml:whitespace="preserve">a #JsonNode, or %NULL. The returned node is owned by the #JsonGenerator and it should not be freed</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="set_indent"
c:identifier="json_generator_set_indent"
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
<parameter name="indent_level" transfer-ownership="none">
<doc xml:whitespace="preserve">the number of repetitions of the indentation character that should be applied when pretty printing</doc>
<type name="guint" c:type="guint"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
<parameter name="indent_char" transfer-ownership="none">
<doc xml:whitespace="preserve">a Unicode character to be used when indenting</doc>
<type name="gunichar" c:type="gunichar"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
<parameter name="is_pretty" transfer-ownership="none">
<doc xml:whitespace="preserve">whether the generated string should be pretty printed</doc>
<type name="gboolean" c:type="gboolean"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
<parameter name="node" transfer-ownership="none">
<doc xml:whitespace="preserve">a #JsonNode</doc>
<type name="Node" c:type="JsonNode*"/>
<type name="utf8" c:type="gchar*"/>
</return-value>
<parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
<parameter name="length"
direction="out"
caller-allocates="0"
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
<parameter name="filename" transfer-ownership="none">
<doc xml:whitespace="preserve">path to the target file</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="generator" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonGenerator</doc>
+ <type name="Generator" c:type="JsonGenerator*"/>
+ </instance-parameter>
<parameter name="stream" transfer-ownership="none">
<doc xml:whitespace="preserve">a #GOutputStream</doc>
<type name="Gio.OutputStream" c:type="GOutputStream*"/>
</method>
<property name="indent" writable="1" transfer-ownership="none">
<doc xml:whitespace="preserve">Number of spaces to be used to indent when pretty printing.</doc>
- <type name="guint"/>
+ <type name="guint" c:type="guint"/>
</property>
<property name="indent-char"
version="0.6"
writable="1"
transfer-ownership="none">
<doc xml:whitespace="preserve">The character that should be used when indenting in pretty print.</doc>
- <type name="guint"/>
+ <type name="guint" c:type="guint"/>
</property>
<property name="pretty" writable="1" transfer-ownership="none">
<doc xml:whitespace="preserve">Whether the output should be "pretty-printed", with indentation and
newlines. The indentation level can be controlled by using the
JsonGenerator:indent property</doc>
- <type name="gboolean"/>
+ <type name="gboolean" c:type="gboolean"/>
</property>
<property name="root"
version="0.4"
structure are private and should only be accessed via the provided
functions and never directly.</doc>
<constructor name="new" c:identifier="json_node_new">
- <doc xml:whitespace="preserve">Creates a new #JsonNode of @type.</doc>
+ <doc xml:whitespace="preserve">Creates a new #JsonNode of @type.
+
+This is a convenience function for json_node_alloc() and json_node_init(),
+and it's the equivalent of:
+
+|[
+ return json_node_init (json_node_alloc (), type);
+]|</doc>
<return-value transfer-ownership="full">
<doc xml:whitespace="preserve">the newly created #JsonNode</doc>
<type name="Node" c:type="JsonNode*"/>
<doc xml:whitespace="preserve">the copied #JsonNode</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="dup_array" c:identifier="json_node_dup_array">
<doc xml:whitespace="preserve">Retrieves the #JsonArray stored inside a #JsonNode and returns it
<doc xml:whitespace="preserve">the #JsonArray with its reference count increased.</doc>
<type name="Array" c:type="JsonArray*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="dup_object" c:identifier="json_node_dup_object">
<doc xml:whitespace="preserve">Retrieves the #JsonObject inside @node. The reference count of
<doc xml:whitespace="preserve">the #JsonObject</doc>
<type name="Object" c:type="JsonObject*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="dup_string" c:identifier="json_node_dup_string">
<doc xml:whitespace="preserve">Gets a copy of the string value stored inside a #JsonNode</doc>
<doc xml:whitespace="preserve">a newly allocated string containing a copy of the #JsonNode contents. Use g_free() to free the allocated resources</doc>
<type name="utf8" c:type="gchar*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="free" c:identifier="json_node_free">
<doc xml:whitespace="preserve">Frees the resources allocated by @node.</doc>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_array" c:identifier="json_node_get_array">
<doc xml:whitespace="preserve">Retrieves the #JsonArray stored inside a #JsonNode</doc>
<doc xml:whitespace="preserve">the #JsonArray</doc>
<type name="Array" c:type="JsonArray*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_boolean" c:identifier="json_node_get_boolean">
<doc xml:whitespace="preserve">Gets the boolean value stored inside a #JsonNode</doc>
<doc xml:whitespace="preserve">a boolean value.</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_double" c:identifier="json_node_get_double">
<doc xml:whitespace="preserve">Gets the double value stored inside a #JsonNode</doc>
<doc xml:whitespace="preserve">a double value.</doc>
<type name="gdouble" c:type="gdouble"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_int" c:identifier="json_node_get_int">
<doc xml:whitespace="preserve">Gets the integer value stored inside a #JsonNode</doc>
<doc xml:whitespace="preserve">an integer value.</doc>
<type name="gint64" c:type="gint64"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_node_type"
c:identifier="json_node_get_node_type"
<doc xml:whitespace="preserve">the type of the node</doc>
<type name="NodeType" c:type="JsonNodeType"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_object" c:identifier="json_node_get_object">
<doc xml:whitespace="preserve">Retrieves the #JsonObject stored inside a #JsonNode</doc>
<doc xml:whitespace="preserve">the #JsonObject</doc>
<type name="Object" c:type="JsonObject*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_parent" c:identifier="json_node_get_parent">
<doc xml:whitespace="preserve">Retrieves the parent #JsonNode of @node.</doc>
<doc xml:whitespace="preserve">the parent node, or %NULL if @node is the root node</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_string" c:identifier="json_node_get_string">
<doc xml:whitespace="preserve">Gets the string value stored inside a #JsonNode</doc>
<return-value transfer-ownership="none">
<doc xml:whitespace="preserve">a string value.</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_value" c:identifier="json_node_get_value">
<doc xml:whitespace="preserve">Retrieves a value from a #JsonNode and copies into @value. When done
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="value"
direction="out"
caller-allocates="1"
<doc xml:whitespace="preserve">a #GType for the payload.</doc>
<type name="GType" c:type="GType"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
+ </method>
+ <method name="init" c:identifier="json_node_init" version="0.16">
+ <doc xml:whitespace="preserve">Initializes a @node to a specific @type.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ <parameter name="type" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the type of JSON node to initialize @node to</doc>
+ <type name="NodeType" c:type="JsonNodeType"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="init_array"
+ c:identifier="json_node_init_array"
+ version="0.16">
+ <doc xml:whitespace="preserve">Initializes @node to %JSON_NODE_ARRAY and sets @array into it.
+
+This function will take a reference on @array.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ <parameter name="array" transfer-ownership="none" allow-none="1">
+ <doc xml:whitespace="preserve">the #JsonArray to initialize @node with, or %NULL</doc>
+ <type name="Array" c:type="JsonArray*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="init_boolean"
+ c:identifier="json_node_init_boolean"
+ version="0.16">
+ <doc xml:whitespace="preserve">Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ <parameter name="value" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a boolean value</doc>
+ <type name="gboolean" c:type="gboolean"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="init_double"
+ c:identifier="json_node_init_double"
+ version="0.16">
+ <doc xml:whitespace="preserve">Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ <parameter name="value" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a floating point value</doc>
+ <type name="gdouble" c:type="gdouble"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="init_int" c:identifier="json_node_init_int" version="0.16">
+ <doc xml:whitespace="preserve">Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ <parameter name="value" transfer-ownership="none">
+ <doc xml:whitespace="preserve">an integer</doc>
+ <type name="gint64" c:type="gint64"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="init_null"
+ c:identifier="json_node_init_null"
+ version="0.16">
+ <doc xml:whitespace="preserve">Initializes @node to %JSON_NODE_NULL.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
+ </method>
+ <method name="init_object"
+ c:identifier="json_node_init_object"
+ version="0.16">
+ <doc xml:whitespace="preserve">Initializes @node to %JSON_NODE_OBJECT and sets @object into it.
+
+This function will take a reference on @object.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ <parameter name="object" transfer-ownership="none" allow-none="1">
+ <doc xml:whitespace="preserve">the #JsonObject to initialize @node with, or %NULL</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="init_string"
+ c:identifier="json_node_init_string"
+ version="0.16">
+ <doc xml:whitespace="preserve">Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+
+If the node has already been initialized once, it will be reset to
+the given type, and any data contained will be cleared.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">the initialized #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">the #JsonNode to initialize</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ <parameter name="value" transfer-ownership="none" allow-none="1">
+ <doc xml:whitespace="preserve">a string value</doc>
+ <type name="utf8" c:type="const char*"/>
+ </parameter>
+ </parameters>
</method>
<method name="is_null" c:identifier="json_node_is_null" version="0.8">
<doc xml:whitespace="preserve">Checks whether @node is a %JSON_NODE_NULL
<doc xml:whitespace="preserve">%TRUE if the node is null</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="set_array" c:identifier="json_node_set_array">
<doc xml:whitespace="preserve">Sets @array inside @node and increases the #JsonArray reference count</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode initialized to %JSON_NODE_ARRAY</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="array" transfer-ownership="none">
<doc xml:whitespace="preserve">a #JsonArray</doc>
<type name="Array" c:type="JsonArray*"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">a boolean value</doc>
<type name="gboolean" c:type="gboolean"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">a double value</doc>
<type name="gdouble" c:type="gdouble"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode of type %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">an integer value</doc>
<type name="gint64" c:type="gint64"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode initialized to %JSON_NODE_OBJECT</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="object" transfer-ownership="none">
<doc xml:whitespace="preserve">a #JsonObject</doc>
<type name="Object" c:type="JsonObject*"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="parent" transfer-ownership="none">
<doc xml:whitespace="preserve">the parent #JsonNode of @node</doc>
<type name="Node" c:type="JsonNode*"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode initialized to %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">a string value</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode initialized to %JSON_NODE_VALUE</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the #GValue to set</doc>
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
</parameters>
</method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode initialized to %JSON_NODE_ARRAY</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="array" transfer-ownership="full">
<doc xml:whitespace="preserve">a #JsonArray</doc>
<type name="Array" c:type="JsonArray*"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode initialized to %JSON_NODE_OBJECT</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
<parameter name="object" transfer-ownership="full">
<doc xml:whitespace="preserve">a #JsonObject</doc>
<type name="Object" c:type="JsonObject*"/>
<doc xml:whitespace="preserve">Retrieves the user readable name of the data type contained by @node.</doc>
<return-value transfer-ownership="none">
<doc xml:whitespace="preserve">a string containing the name of the type. The returned string is owned by the node and should never be modified or freed</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="node" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonNode</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </instance-parameter>
+ </parameters>
</method>
+ <function name="alloc" c:identifier="json_node_alloc" version="0.16">
+ <doc xml:whitespace="preserve">Allocates a new #JsonNode. Use json_node_init() and its variants
+to initialize the returned value.</doc>
+ <return-value transfer-ownership="full">
+ <doc xml:whitespace="preserve">the newly allocated #JsonNode. Use json_node_free() to free the resources allocated by this function</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ </function>
</record>
<enumeration name="NodeType" c:type="JsonNodeType">
<doc xml:whitespace="preserve">Indicates the content of a #JsonNode.</doc>
- <member name="object" value="0" c:identifier="JSON_NODE_OBJECT"/>
- <member name="array" value="1" c:identifier="JSON_NODE_ARRAY"/>
- <member name="value" value="2" c:identifier="JSON_NODE_VALUE"/>
- <member name="null" value="3" c:identifier="JSON_NODE_NULL"/>
+ <member name="object" value="0" c:identifier="JSON_NODE_OBJECT">
+ <doc xml:whitespace="preserve">The node contains a #JsonObject</doc>
+ </member>
+ <member name="array" value="1" c:identifier="JSON_NODE_ARRAY">
+ <doc xml:whitespace="preserve">The node contains a #JsonArray</doc>
+ </member>
+ <member name="value" value="2" c:identifier="JSON_NODE_VALUE">
+ <doc xml:whitespace="preserve">The node contains a fundamental type</doc>
+ </member>
+ <member name="null" value="3" c:identifier="JSON_NODE_NULL">
+ <doc xml:whitespace="preserve">Special type, for nodes containing null</doc>
+ </member>
</enumeration>
<record name="Object"
c:type="JsonObject"
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="node" transfer-ownership="full">
<doc xml:whitespace="preserve">the value of the member</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the JSON object member to access</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="func"
transfer-ownership="none"
scope="call"
<type name="Array" c:type="JsonArray*"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="gdouble" c:type="gdouble"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="gint64" c:type="gint64"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the JSON object member to access</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="utf8"/>
</type>
</return-value>
+ <parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_null_member"
c:identifier="json_object_get_null_member"
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="Object" c:type="JsonObject*"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<doc xml:whitespace="preserve">the number of members</doc>
<type name="guint" c:type="guint"/>
</return-value>
+ <parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_string_member"
c:identifier="json_object_get_string_member"
See also: json_object_get_member()</doc>
<return-value transfer-ownership="none">
<doc xml:whitespace="preserve">the string value of the object's member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="Node"/>
</type>
</return-value>
+ <parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="has_member" c:identifier="json_object_has_member">
<doc xml:whitespace="preserve">Checks whether @object has a member named @member_name.</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of a JSON object member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<doc xml:whitespace="preserve">the passed #JsonObject, with the reference count increased by one.</doc>
<type name="Object" c:type="JsonObject*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="remove_member" c:identifier="json_object_remove_member">
<doc xml:whitespace="preserve">Removes @member_name from @object, freeing its allocated resources.</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member to remove</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="full">
<doc xml:whitespace="preserve">the value of the member</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="node" transfer-ownership="full">
<doc xml:whitespace="preserve">the value of the member</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="full">
<doc xml:whitespace="preserve">the value of the member</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="object" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonObject</doc>
+ <type name="Object" c:type="JsonObject*"/>
+ </instance-parameter>
+ </parameters>
</method>
</record>
<callback name="ObjectForeach" c:type="JsonObjectForeach" version="0.8">
</parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="member_node" transfer-ownership="none">
<doc xml:whitespace="preserve">a #JsonNode containing the @member_name value</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="array" transfer-ownership="none">
<type name="Array" c:type="JsonArray*"/>
</parameter>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="array" transfer-ownership="none">
<type name="Array" c:type="JsonArray*"/>
</parameter>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
+ </parameters>
</virtual-method>
<virtual-method name="error">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="error" transfer-ownership="none">
- <type name="GLib.Error" c:type="GError*"/>
+ <type name="GLib.Error" c:type="const GError*"/>
</parameter>
</parameters>
</virtual-method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="object" transfer-ownership="none">
<type name="Object" c:type="JsonObject*"/>
</parameter>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="object" transfer-ownership="none">
<type name="Object" c:type="JsonObject*"/>
</parameter>
<parameter name="member_name" transfer-ownership="none">
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</virtual-method>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
+ </parameters>
</virtual-method>
<virtual-method name="parse_end">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
+ </parameters>
</virtual-method>
<virtual-method name="parse_start">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
+ </parameters>
</virtual-method>
<method name="get_current_line"
c:identifier="json_parser_get_current_line">
<doc xml:whitespace="preserve">the currently parsed line, or 0.</doc>
<type name="guint" c:type="guint"/>
</return-value>
+ <parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_current_pos"
c:identifier="json_parser_get_current_pos">
<doc xml:whitespace="preserve">the position in the current line, or 0.</doc>
<type name="guint" c:type="guint"/>
</return-value>
+ <parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_root" c:identifier="json_parser_get_root">
<doc xml:whitespace="preserve">Retrieves the top level node from the parsed JSON stream.</doc>
<doc xml:whitespace="preserve">the root #JsonNode . The returned node is owned by the #JsonParser and should never be modified or freed.</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="has_assignment"
c:identifier="json_parser_has_assignment"
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="variable_name"
direction="out"
caller-allocates="0"
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="data" transfer-ownership="none">
<doc xml:whitespace="preserve">the buffer to parse</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="length" transfer-ownership="none">
<doc xml:whitespace="preserve">the length of the buffer, or -1</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="filename" transfer-ownership="none">
<doc xml:whitespace="preserve">the path for the file to parse</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="stream" transfer-ownership="none">
<doc xml:whitespace="preserve">an open #GInputStream</doc>
<type name="Gio.InputStream" c:type="GInputStream*"/>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="stream" transfer-ownership="none">
<doc xml:whitespace="preserve">a #GInputStream</doc>
<type name="Gio.InputStream" c:type="GInputStream*"/>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="parser" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonParser</doc>
+ <type name="Parser" c:type="JsonParser*"/>
+ </instance-parameter>
<parameter name="result" transfer-ownership="none">
<doc xml:whitespace="preserve">a #GAsyncResult</doc>
<type name="Gio.AsyncResult" c:type="GAsyncResult*"/>
has successfully parsed a single element of a #JsonArray. The
array and element index are passed to the signal handlers.</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="array" transfer-ownership="none">
</parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the newly parsed element</doc>
- <type name="gint"/>
+ <type name="gint" c:type="gint"/>
</parameter>
</parameters>
</glib:signal>
<doc xml:whitespace="preserve">The ::array-end signal is emitted each time the #JsonParser
has successfully parsed an entire #JsonArray</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="array" transfer-ownership="none">
<doc xml:whitespace="preserve">The ::array-start signal is emitted each time the #JsonParser
starts parsing a #JsonArray</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
</glib:signal>
<glib:signal name="error" when="last">
<doc xml:whitespace="preserve">The ::error signal is emitted each time a #JsonParser encounters
an error in a JSON stream.</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="error" transfer-ownership="none">
<doc xml:whitespace="preserve">a pointer to the #GError</doc>
- <type name="gpointer"/>
+ <type name="gpointer" c:type="gpointer"/>
</parameter>
</parameters>
</glib:signal>
<doc xml:whitespace="preserve">The ::object-end signal is emitted each time the #JsonParser
has successfully parsed an entire #JsonObject.</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="object" transfer-ownership="none">
has successfully parsed a single member of a #JsonObject. The
object and member are passed to the signal handlers.</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="object" transfer-ownership="none">
</parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the newly parsed member</doc>
- <type name="utf8"/>
+ <type name="utf8" c:type="gchar*"/>
</parameter>
</parameters>
</glib:signal>
<doc xml:whitespace="preserve">The ::object-start signal is emitted each time the #JsonParser
starts parsing a #JsonObject.</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
</glib:signal>
<glib:signal name="parse-end" when="last">
<doc xml:whitespace="preserve">The ::parse-end signal is emitted when the parser successfully
finished parsing a JSON data stream</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
</glib:signal>
<glib:signal name="parse-start" when="last">
<doc xml:whitespace="preserve">The ::parse-start signal is emitted when the parser began parsing
a JSON data stream.</doc>
<return-value transfer-ownership="none">
- <type name="none"/>
+ <type name="none" c:type="void"/>
</return-value>
</glib:signal>
</class>
<type name="Object" c:type="JsonObject*"/>
</parameter>
<parameter name="member_name" transfer-ownership="none">
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</callback>
<type name="Parser" c:type="JsonParser*"/>
</parameter>
<parameter name="error" transfer-ownership="none">
- <type name="GLib.Error" c:type="GError*"/>
+ <type name="GLib.Error" c:type="const GError*"/>
</parameter>
</parameters>
</callback>
<doc xml:whitespace="preserve">Error enumeration for #JsonParser
This enumeration can be extended at later date</doc>
- <member name="parse" value="0" c:identifier="JSON_PARSER_ERROR_PARSE"/>
+ <member name="parse" value="0" c:identifier="JSON_PARSER_ERROR_PARSE">
+ <doc xml:whitespace="preserve">parse error</doc>
+ </member>
<member name="trailing_comma"
value="1"
- c:identifier="JSON_PARSER_ERROR_TRAILING_COMMA"/>
+ c:identifier="JSON_PARSER_ERROR_TRAILING_COMMA">
+ <doc xml:whitespace="preserve">unexpected trailing comma</doc>
+ </member>
<member name="missing_comma"
value="2"
- c:identifier="JSON_PARSER_ERROR_MISSING_COMMA"/>
+ c:identifier="JSON_PARSER_ERROR_MISSING_COMMA">
+ <doc xml:whitespace="preserve">expected comma</doc>
+ </member>
<member name="missing_colon"
value="3"
- c:identifier="JSON_PARSER_ERROR_MISSING_COLON"/>
+ c:identifier="JSON_PARSER_ERROR_MISSING_COLON">
+ <doc xml:whitespace="preserve">expected colon</doc>
+ </member>
<member name="invalid_bareword"
value="4"
- c:identifier="JSON_PARSER_ERROR_INVALID_BAREWORD"/>
- <member name="unknown"
+ c:identifier="JSON_PARSER_ERROR_INVALID_BAREWORD">
+ <doc xml:whitespace="preserve">invalid bareword</doc>
+ </member>
+ <member name="empty_member_name"
value="5"
- c:identifier="JSON_PARSER_ERROR_UNKNOWN"/>
+ c:identifier="JSON_PARSER_ERROR_EMPTY_MEMBER_NAME">
+ <doc xml:whitespace="preserve">empty member name (Since: 0.16)</doc>
+ </member>
+ <member name="unknown"
+ value="6"
+ c:identifier="JSON_PARSER_ERROR_UNKNOWN">
+ <doc xml:whitespace="preserve">unknown error</doc>
+ </member>
</enumeration>
<record name="ParserPrivate" c:type="JsonParserPrivate" disguised="1">
</record>
<parameters>
<parameter name="expression" transfer-ownership="none">
<doc xml:whitespace="preserve">a JSONPath expression</doc>
- <type name="utf8" c:type="char*"/>
+ <type name="utf8" c:type="const char*"/>
</parameter>
<parameter name="root" transfer-ownership="none">
<doc xml:whitespace="preserve">the root of a JSON tree</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="path" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonPath</doc>
+ <type name="Path" c:type="JsonPath*"/>
+ </instance-parameter>
<parameter name="expression" transfer-ownership="none">
<doc xml:whitespace="preserve">a JSONPath expression</doc>
- <type name="utf8" c:type="char*"/>
+ <type name="utf8" c:type="const char*"/>
</parameter>
</parameters>
</method>
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="path" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a compiled #JsonPath</doc>
+ <type name="Path" c:type="JsonPath*"/>
+ </instance-parameter>
<parameter name="root" transfer-ownership="none">
<doc xml:whitespace="preserve">a #JsonNode</doc>
<type name="Node" c:type="JsonNode*"/>
<doc xml:whitespace="preserve">Error code enumeration for the %JSON_PATH_ERROR domain.</doc>
<member name="path_error_invalid_query"
value="0"
- c:identifier="JSON_PATH_ERROR_INVALID_QUERY"/>
+ c:identifier="JSON_PATH_ERROR_INVALID_QUERY">
+ <doc xml:whitespace="preserve">Invalid query</doc>
+ </member>
</enumeration>
<class name="Reader"
c:symbol-prefix="reader"
<doc xml:whitespace="preserve">the number of elements, or -1. In case of failure the #JsonReader is set in an error state</doc>
<type name="gint" c:type="gint"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="count_members"
c:identifier="json_reader_count_members"
<doc xml:whitespace="preserve">the number of members, or -1. In case of failure the #JsonReader is set in an error state</doc>
<type name="gint" c:type="gint"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="end_element"
c:identifier="json_reader_end_element"
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="end_member"
c:identifier="json_reader_end_member"
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_boolean_value"
c:identifier="json_reader_get_boolean_value"
<doc xml:whitespace="preserve">the boolean value</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_double_value"
c:identifier="json_reader_get_double_value"
<doc xml:whitespace="preserve">the floating point value</doc>
<type name="gdouble" c:type="gdouble"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_error"
c:identifier="json_reader_get_error"
is in error state</doc>
<return-value transfer-ownership="none">
<doc xml:whitespace="preserve">the pointer to the error, or %NULL</doc>
- <type name="GLib.Error" c:type="GError*"/>
+ <type name="GLib.Error" c:type="const GError*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_int_value"
c:identifier="json_reader_get_int_value"
<doc xml:whitespace="preserve">the integer value</doc>
<type name="gint64" c:type="gint64"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_member_name"
c:identifier="json_reader_get_member_name"
<doc xml:whitespace="preserve">Retrieves the name of the current member.</doc>
<return-value transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member, or %NULL</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_null_value"
c:identifier="json_reader_get_null_value"
<doc xml:whitespace="preserve">%TRUE if 'null' is set, and %FALSE otherwise</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_string_value"
c:identifier="json_reader_get_string_value"
<doc xml:whitespace="preserve">Retrieves the string value of the current position of @reader</doc>
<return-value transfer-ownership="none">
<doc xml:whitespace="preserve">the string value</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="get_value"
c:identifier="json_reader_get_value"
<doc xml:whitespace="preserve">a #JsonNode, or %NULL. The returned node is owned by the #JsonReader and it should not be modified or freed directly</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="is_array"
c:identifier="json_reader_is_array"
<doc xml:whitespace="preserve">%TRUE if the #JsonReader is on an array, and %FALSE otherwise</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="is_object"
c:identifier="json_reader_is_object"
<doc xml:whitespace="preserve">%TRUE if the #JsonReader is on an object, and %FALSE otherwise</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="is_value"
c:identifier="json_reader_is_value"
<doc xml:whitespace="preserve">%TRUE if the #JsonReader is on a value, and %FALSE otherwise</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="list_members"
c:identifier="json_reader_list_members"
<type name="utf8"/>
</array>
</return-value>
+ <parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
+ </parameters>
</method>
<method name="read_element"
c:identifier="json_reader_read_element"
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
<parameter name="index_" transfer-ownership="none">
<doc xml:whitespace="preserve">the index of the element</doc>
<type name="guint" c:type="guint"/>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
<parameter name="member_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the member to read</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="reader" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonReader</doc>
+ <type name="Reader" c:type="JsonReader*"/>
+ </instance-parameter>
<parameter name="root" transfer-ownership="none" allow-none="1">
<doc xml:whitespace="preserve">a #JsonNode</doc>
<type name="Node" c:type="JsonNode*"/>
<doc xml:whitespace="preserve">Error codes enumeration for #JsonReader errors</doc>
<member name="no_array"
value="0"
- c:identifier="JSON_READER_ERROR_NO_ARRAY"/>
+ c:identifier="JSON_READER_ERROR_NO_ARRAY">
+ <doc xml:whitespace="preserve">No array found at the current position</doc>
+ </member>
<member name="invalid_index"
value="1"
- c:identifier="JSON_READER_ERROR_INVALID_INDEX"/>
+ c:identifier="JSON_READER_ERROR_INVALID_INDEX">
+ <doc xml:whitespace="preserve">Index out of bounds</doc>
+ </member>
<member name="no_object"
value="2"
- c:identifier="JSON_READER_ERROR_NO_OBJECT"/>
+ c:identifier="JSON_READER_ERROR_NO_OBJECT">
+ <doc xml:whitespace="preserve">No object found at the current position</doc>
+ </member>
<member name="invalid_member"
value="3"
- c:identifier="JSON_READER_ERROR_INVALID_MEMBER"/>
+ c:identifier="JSON_READER_ERROR_INVALID_MEMBER">
+ <doc xml:whitespace="preserve">Member not found</doc>
+ </member>
<member name="invalid_node"
value="4"
- c:identifier="JSON_READER_ERROR_INVALID_NODE"/>
+ c:identifier="JSON_READER_ERROR_INVALID_NODE">
+ <doc xml:whitespace="preserve">No valid node found at the current position</doc>
+ </member>
<member name="no_value"
value="5"
- c:identifier="JSON_READER_ERROR_NO_VALUE"/>
+ c:identifier="JSON_READER_ERROR_NO_VALUE">
+ <doc xml:whitespace="preserve">The node at the current position does not hold a value</doc>
+ </member>
<member name="invalid_type"
value="6"
- c:identifier="JSON_READER_ERROR_INVALID_TYPE"/>
+ c:identifier="JSON_READER_ERROR_INVALID_TYPE">
+ <doc xml:whitespace="preserve">The node at the current position does not hold a value of the desired type</doc>
+ </member>
</enumeration>
<record name="ReaderPrivate" c:type="JsonReaderPrivate" disguised="1">
</record>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value"
direction="out"
<type name="GObject.ParamSpec" c:type="GParamSpec*"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="char*"/>
+ <type name="utf8" c:type="const char*"/>
</parameter>
</parameters>
</virtual-method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="pspec" transfer-ownership="none">
<type name="GObject.ParamSpec" c:type="GParamSpec*"/>
</parameter>
<type name="GObject.ParamSpec" c:type="GParamSpec**"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="n_pspecs" transfer-ownership="none">
<type name="guint" c:type="guint*"/>
</parameter>
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the property</doc>
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
<parameter name="pspec" transfer-ownership="none">
<doc xml:whitespace="preserve">a #GParamSpec</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="pspec" transfer-ownership="none">
<type name="GObject.ParamSpec" c:type="GParamSpec*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
</parameters>
</virtual-method>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonSerializable</doc>
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">a pointer to an uninitialized #GValue</doc>
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonSerializable object</doc>
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the property</doc>
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
<parameter name="pspec" transfer-ownership="none">
<doc xml:whitespace="preserve">a #GParamSpec</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonSerializable</doc>
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value"
direction="out"
<type name="GObject.ParamSpec" c:type="GParamSpec*"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonSerializable</doc>
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="char*"/>
+ <type name="utf8" c:type="const char*"/>
</parameter>
</parameters>
</method>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="pspec" transfer-ownership="none">
<type name="GObject.ParamSpec" c:type="GParamSpec*"/>
</parameter>
</array>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonSerializable</doc>
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="n_pspecs"
direction="out"
caller-allocates="0"
<type name="Node" c:type="JsonNode*"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <doc xml:whitespace="preserve">a #JsonSerializable object</doc>
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the property</doc>
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
<parameter name="pspec" transfer-ownership="none">
<doc xml:whitespace="preserve">a #GParamSpec</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
+ <instance-parameter name="serializable" transfer-ownership="none">
+ <type name="Serializable" c:type="JsonSerializable*"/>
+ </instance-parameter>
<parameter name="pspec" transfer-ownership="none">
<type name="GObject.ParamSpec" c:type="GParamSpec*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
</parameters>
</method>
</parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
<doc xml:whitespace="preserve">the value of the property</doc>
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
<parameter name="pspec" transfer-ownership="none">
<doc xml:whitespace="preserve">a #GParamSpec</doc>
</parameter>
<parameter name="property_name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="value"
direction="out"
</parameter>
<parameter name="name" transfer-ownership="none">
<doc xml:whitespace="preserve">the name of the property</doc>
- <type name="utf8" c:type="char*"/>
+ <type name="utf8" c:type="const char*"/>
</parameter>
</parameters>
</callback>
<type name="GObject.ParamSpec" c:type="GParamSpec*"/>
</parameter>
<parameter name="value" transfer-ownership="none">
- <type name="GObject.Value" c:type="GValue*"/>
+ <type name="GObject.Value" c:type="const GValue*"/>
</parameter>
</parameters>
</callback>
</parameter>
<parameter name="data" transfer-ownership="none">
<doc xml:whitespace="preserve">a JSON data stream</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="length" transfer-ownership="none">
<doc xml:whitespace="preserve">length of the data stream</doc>
</parameter>
<parameter name="data" transfer-ownership="none">
<doc xml:whitespace="preserve">a JSON data stream</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="length" transfer-ownership="none">
<doc xml:whitespace="preserve">length of the data stream, or -1 if it is NUL-terminated</doc>
If a @signature is provided but the JSON structure cannot be mapped to it,
%NULL is returned and error is set to %G_IO_ERROR_INVALID_DATA.
If @signature is %NULL, the conversion is done based strictly on the types
-in the JSON nodes.</doc>
- <return-value transfer-ownership="full">
- <doc xml:whitespace="preserve">A newly created #GVariant compliant with @signature, or %NULL on error</doc>
+in the JSON nodes.
+
+The returned variant has a floating reference that will need to be sunk
+by the caller code.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">A newly created, floating #GVariant compliant with @signature, or %NULL on error</doc>
<type name="GLib.Variant" c:type="GVariant*"/>
</return-value>
<parameters>
</parameter>
<parameter name="signature" transfer-ownership="none" allow-none="1">
<doc xml:whitespace="preserve">A valid #GVariant type string, or %NULL</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</function>
<doc xml:whitespace="preserve">Converts a JSON string to a #GVariant value. This method works exactly
like json_gvariant_deserialize(), but takes a JSON encoded string instead.
The string is first converted to a #JsonNode using #JsonParser, and then
-json_gvariant_deserialize() is called.</doc>
- <return-value transfer-ownership="full">
- <doc xml:whitespace="preserve">A newly created #GVariant compliant with @signature, or %NULL on error</doc>
+json_gvariant_deserialize() is called.
+
+The returned variant has a floating reference that will need to be sunk
+by the caller code.</doc>
+ <return-value transfer-ownership="none">
+ <doc xml:whitespace="preserve">A newly created, floating #GVariant compliant with @signature, or %NULL on error</doc>
<type name="GLib.Variant" c:type="GVariant*"/>
</return-value>
<parameters>
<parameter name="json" transfer-ownership="none">
<doc xml:whitespace="preserve">A JSON data string</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="length" transfer-ownership="none">
<doc xml:whitespace="preserve">The length of @json, or -1 if %NULL-terminated</doc>
</parameter>
<parameter name="signature" transfer-ownership="none" allow-none="1">
<doc xml:whitespace="preserve">A valid #GVariant type string, or %NULL</doc>
- <type name="utf8" c:type="gchar*"/>
+ <type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</function>
</parameter>
</parameters>
</function>
+ <function name="node_alloc"
+ c:identifier="json_node_alloc"
+ moved-to="Node.alloc"
+ version="0.16">
+ <doc xml:whitespace="preserve">Allocates a new #JsonNode. Use json_node_init() and its variants
+to initialize the returned value.</doc>
+ <return-value transfer-ownership="full">
+ <doc xml:whitespace="preserve">the newly allocated #JsonNode. Use json_node_free() to free the resources allocated by this function</doc>
+ <type name="Node" c:type="JsonNode*"/>
+ </return-value>
+ </function>
<function name="serialize_gobject"
c:identifier="json_serialize_gobject"
deprecated="Use json_gobject_to_data() instead"
libjson_glib_1_0_la_LIBADD = $(JSON_LIBS)
libjson_glib_1_0_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
-libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
+libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -no-undefined -export-symbols $(top_srcdir)/json-glib/json-glib.symbols -rpath $(libdir)
+
+EXTRA_DIST += json-glib.symbols
jsonincludedir = $(includedir)/json-glib-1.0/json-glib
jsoninclude_DATA = \
CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
-EXTRA_DIST += json-glib.symbols
-
dist-hook: ../build/win32/vs9/json-glib.vcproj ../build/win32/vs10/json-glib.vcxproj ../build/win32/vs10/json-glib.vcxproj.filters
../build/win32/vs9/json-glib.vcproj: $(top_srcdir)/build/win32/vs9/json-glib.vcprojin
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(am__dist_gir_DATA_DIST) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/json-version.h.in \
- $(top_srcdir)/build/autotools/Makefile.am.enums \
+DIST_COMMON = $(top_srcdir)/build/autotools/Makefile.am.silent \
$(top_srcdir)/build/autotools/Makefile.am.gtest \
+ $(top_srcdir)/build/autotools/Makefile.am.enums \
$(top_srcdir)/build/autotools/Makefile.am.marshal \
- $(top_srcdir)/build/autotools/Makefile.am.silent
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(srcdir)/json-version.h.in $(top_srcdir)/build/depcomp \
+ $(am__dist_gir_DATA_DIST) $(top_srcdir)/build/test-driver
@HAVE_INTROSPECTION_TRUE@am__append_1 = $(dist_gir_DATA) $(typelibs_DATA)
subdir = json-glib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
libjson_glib_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libjson_glib_1_0_la_LDFLAGS) \
$(LDFLAGS) -o $@
+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 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build/depcomp
am__depfiles_maybe = depfiles
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-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_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libjson_glib_1_0_la_SOURCES)
DIST_SOURCES = $(libjson_glib_1_0_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive
+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
am__dist_gir_DATA_DIST = Json-1.0.gir
DATA = $(dist_gir_DATA) $(jsoninclude_DATA) $(typelibs_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ check recheck distdir
+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
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+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)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+ case '$@' in \
+ */*) \
+ case '$*' in \
+ */*) b='$*';; \
+ *) b=`echo '$@' | sed 's/\.log$$//'`; \
+ esac;; \
+ *) \
+ b='$*';; \
+ esac
+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)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
# initialize variables for unconditional += appending
EXTRA_DIST = $(srcdir)/$(enum_tmpl_h) $(srcdir)/$(enum_tmpl_c) \
- $(srcdir)/$(glib_marshal_list) json-version.h.in json-glib.h \
- json-version.h abicheck.sh json-glib.symbols
+ $(srcdir)/$(glib_marshal_list) json-glib.symbols \
+ json-version.h.in json-glib.h json-version.h abicheck.sh
TEST_PROGS =
# build this directory *before* the tests/
lib_LTLIBRARIES = libjson-glib-1.0.la
libjson_glib_1_0_la_LIBADD = $(JSON_LIBS)
libjson_glib_1_0_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
-libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
+libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) $(JSON_GCOV_LDADD) -no-undefined -export-symbols $(top_srcdir)/json-glib/json-glib.symbols -rpath $(libdir)
jsonincludedir = $(includedir)/json-glib-1.0/json-glib
jsoninclude_DATA = \
$(source_h) \
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.silent $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/autotools/Makefile.am.marshal $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
$(am__aclocal_m4_deps):
json-version.h: $(top_builddir)/config.status $(srcdir)/json-version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
libjson-glib-1.0.la: $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_DEPENDENCIES) $(EXTRA_libjson_glib_1_0_la_DEPENDENCIES)
$(AM_V_CCLD)$(libjson_glib_1_0_la_LINK) -rpath $(libdir) $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_LIBADD) $(LIBS)
-rm -rf .libs _libs
install-dist_girDATA: $(dist_gir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
@list='$(dist_gir_DATA)'; test -n "$(girdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
install-jsonincludeDATA: $(jsoninclude_DATA)
@$(NORMAL_INSTALL)
- test -z "$(jsonincludedir)" || $(MKDIR_P) "$(DESTDIR)$(jsonincludedir)"
@list='$(jsoninclude_DATA)'; test -n "$(jsonincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(jsonincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(jsonincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
dir='$(DESTDIR)$(jsonincludedir)'; $(am__uninstall_files_from_dir)
install-typelibsDATA: $(typelibs_DATA)
@$(NORMAL_INSTALL)
- test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)"
@list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(typelibsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir)
# 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.
-$(RECURSIVE_TARGETS):
+# 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= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ 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; \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+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
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
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- $(am__tty_colors); \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
- ;; \
- *) \
- col=$$grn; res=PASS; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
- fi; \
- echo "$${col}$$res$${std}: $$tst"; \
- done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
+# 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
+# exand 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; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
- else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ fi; \
+ if test -n "$$am__remaking_logs"; then \
+ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+ "recursion detected" >&2; \
+ else \
+ 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 \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ echo "$@: invalid 'result_count' usage" >&2; exit 4; \
fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
+ shift; \
+ desc=$$1 count=$$2; \
+ if test $$maybe_colorize = yes && test $$count -gt 0; then \
+ color_start=$$3 color_end=$$std; \
else \
- skipped="($$skip tests were not run)"; \
+ color_start= color_end=; \
fi; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- col="$$grn"; \
- else \
- col="$$red"; \
- fi; \
- echo "$${col}$$dashes$${std}"; \
- echo "$${col}$$banner$${std}"; \
- test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
- test -z "$$report" || echo "$${col}$$report$${std}"; \
- echo "$${col}$$dashes$${std}"; \
- test "$$failed" -eq 0; \
- else :; 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 $$?
+abicheck.sh.log: abicheck.sh
+ @p='abicheck.sh'; \
+ b='abicheck.sh'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+.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'`; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || 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; \
"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)
uninstall-am: uninstall-dist_girDATA uninstall-jsonincludeDATA \
uninstall-libLTLIBRARIES uninstall-typelibsDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
- check-am ctags-recursive install install-am install-strip \
- tags-recursive
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
+ install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-TESTS check-am check-local clean \
- clean-generic clean-libLTLIBRARIES clean-libtool ctags \
- ctags-recursive dist-hook distclean distclean-compile \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-TESTS check-am check-local clean 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-data install-data-am install-dist_girDATA install-dvi \
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-recursive uninstall uninstall-am \
+ recheck tags tags-am uninstall uninstall-am \
uninstall-dist_girDATA uninstall-jsonincludeDATA \
uninstall-libLTLIBRARIES uninstall-typelibsDATA
GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
ignore_logdir=false ; \
fi ; \
+ if test -d "$(top_srcdir)/.git"; then \
+ export REVISION="`git describe`" ; \
+ else \
+ export REVISION="$(JSON_VERSION) $(JSON_RELEASE_STATUS)" ; \
+ fi ; \
+ export TIMESTAMP=`date +%Y-%m-%dT%H:%M:%S%z` ; \
for subdir in $(SUBDIRS) . ; do \
test "$$subdir" = "." -o "$$subdir" = "po" || \
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
done ; \
$$ignore_logdir || { \
- echo '<?xml version="1.0"?>' > $@.xml ; \
- echo '<report-collection>' >> $@.xml ; \
- echo '<info>' >> $@.xml ; \
- echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
- echo ' <version>$(VERSION)</version>' >> $@.xml ; \
- echo '</info>' >> $@.xml ; \
+ echo '<?xml version="1.0"?>' > $@.xml ; \
+ echo '<report-collection>' >> $@.xml ; \
+ echo '<info>' >> $@.xml ; \
+ echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
+ echo ' <version>$(JSON_VERSION)</version>' >> $@.xml ; \
+ echo " <revision>$$REVISION</revision>" >> $@.xml ; \
+ echo " <date>$$TIMESTAMP</date>" >> $@.xml ; \
+ echo '</info>' >> $@.xml ; \
for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
done ; \
node = g_ptr_array_index (array->elements, index_);
g_return_val_if_fail (node != NULL, FALSE);
- return JSON_NODE_TYPE (node) == JSON_NODE_NULL;
+ if (JSON_NODE_HOLDS_NULL (node))
+ return TRUE;
+
+ if (JSON_NODE_HOLDS_ARRAY (node))
+ return json_node_get_array (node) == NULL;
+
+ if (JSON_NODE_HOLDS_OBJECT (node))
+ return json_node_get_object (node) == NULL;
+
+ return FALSE;
}
/**
json_array_add_int_element (JsonArray *array,
gint64 value)
{
- JsonNode *node;
-
g_return_if_fail (array != NULL);
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (node, value);
-
- g_ptr_array_add (array->elements, node);
+ g_ptr_array_add (array->elements, json_node_init_int (json_node_alloc (), value));
}
/**
json_array_add_double_element (JsonArray *array,
gdouble value)
{
- JsonNode *node;
-
g_return_if_fail (array != NULL);
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_double (node, value);
-
- g_ptr_array_add (array->elements, node);
+ g_ptr_array_add (array->elements, json_node_init_double (json_node_alloc (), value));
}
/**
json_array_add_boolean_element (JsonArray *array,
gboolean value)
{
- JsonNode *node;
-
g_return_if_fail (array != NULL);
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_boolean (node, value);
-
- g_ptr_array_add (array->elements, node);
+ g_ptr_array_add (array->elements, json_node_init_boolean (json_node_alloc (), value));
}
/**
JsonNode *node;
g_return_if_fail (array != NULL);
- g_return_if_fail (value != NULL);
- if (value != NULL)
- {
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_string (node, value);
- }
+ node = json_node_alloc ();
+
+ if (value != NULL && *value != '\0')
+ json_node_init_string (node, value);
else
- node = json_node_new (JSON_NODE_NULL);
+ json_node_init_null (node);
g_ptr_array_add (array->elements, node);
}
void
json_array_add_null_element (JsonArray *array)
{
- JsonNode *node;
-
g_return_if_fail (array != NULL);
- node = json_node_new (JSON_NODE_NULL);
-
- g_ptr_array_add (array->elements, node);
+ g_ptr_array_add (array->elements, json_node_init_null (json_node_alloc ()));
}
/**
* json_array_add_array_element:
* @array: a #JsonArray
- * @value: (transfer full): a #JsonArray
+ * @value: (allow-none) (transfer full): a #JsonArray
*
* Conveniently adds an array into @array. The @array takes ownership
* of the newly added #JsonArray
JsonNode *node;
g_return_if_fail (array != NULL);
- g_return_if_fail (value != NULL);
+
+ node = json_node_alloc ();
if (value != NULL)
{
- node = json_node_new (JSON_NODE_ARRAY);
- json_node_take_array (node, value);
+ json_node_init_array (node, value);
+ json_array_unref (value);
}
else
- node = json_node_new (JSON_NODE_NULL);
+ json_node_init_null (node);
g_ptr_array_add (array->elements, node);
}
JsonNode *node;
g_return_if_fail (array != NULL);
- g_return_if_fail (value != NULL);
+
+ node = json_node_alloc ();
if (value != NULL)
{
- node = json_node_new (JSON_NODE_OBJECT);
- json_node_take_object (node, value);
+ json_node_init_object (node, value);
+ json_object_unref (value);
}
else
- node = json_node_new (JSON_NODE_NULL);
+ json_node_init_null (node);
g_ptr_array_add (array->elements, node);
}
state->data.object = NULL;
state->member_name = NULL;
break;
+
case JSON_BUILDER_MODE_ARRAY:
json_array_unref (state->data.array);
state->data.array = NULL;
break;
+
default:
g_assert_not_reached ();
}
* Return value: (transfer none): the #JsonBuilder, or %NULL if the call was inconsistent
*/
JsonBuilder *
-json_builder_set_member_name (JsonBuilder *builder, const gchar *member_name)
+json_builder_set_member_name (JsonBuilder *builder,
+ const gchar *member_name)
{
JsonBuilderState *state;
* Return value: (transfer none): the #JsonBuilder, or %NULL if the call was inconsistent
*/
JsonBuilder *
-json_builder_add_value (JsonBuilder *builder, JsonNode *node)
+json_builder_add_value (JsonBuilder *builder,
+ JsonNode *node)
{
JsonBuilderState *state;
* Return value: (transfer none): the #JsonBuilder, or %NULL if the call was inconsistent
*/
JsonBuilder *
-json_builder_add_int_value (JsonBuilder *builder, gint64 value)
+json_builder_add_int_value (JsonBuilder *builder,
+ gint64 value)
{
JsonBuilderState *state;
* Return value: (transfer none): the #JsonBuilder, or %NULL if the call was inconsistent
*/
JsonBuilder *
-json_builder_add_double_value (JsonBuilder *builder, gdouble value)
+json_builder_add_double_value (JsonBuilder *builder,
+ gdouble value)
{
JsonBuilderState *state;
* Return value: (transfer none): the #JsonBuilder, or %NULL if the call was inconsistent
*/
JsonBuilder *
-json_builder_add_boolean_value (JsonBuilder *builder, gboolean value)
+json_builder_add_boolean_value (JsonBuilder *builder,
+ gboolean value)
{
JsonBuilderState *state;
* Return value: (transfer none): the #JsonBuilder, or %NULL if the call was inconsistent
*/
JsonBuilder *
-json_builder_add_string_value (JsonBuilder *builder, const gchar *value)
+json_builder_add_string_value (JsonBuilder *builder,
+ const gchar *value)
{
JsonBuilderState *state;
{ JSON_PARSER_ERROR_MISSING_COMMA, "JSON_PARSER_ERROR_MISSING_COMMA", "missing-comma" },
{ JSON_PARSER_ERROR_MISSING_COLON, "JSON_PARSER_ERROR_MISSING_COLON", "missing-colon" },
{ JSON_PARSER_ERROR_INVALID_BAREWORD, "JSON_PARSER_ERROR_INVALID_BAREWORD", "invalid-bareword" },
+ { JSON_PARSER_ERROR_EMPTY_MEMBER_NAME, "JSON_PARSER_ERROR_EMPTY_MEMBER_NAME", "empty-member-name" },
{ JSON_PARSER_ERROR_UNKNOWN, "JSON_PARSER_ERROR_UNKNOWN", "unknown" },
{ 0, NULL, NULL }
};
JsonGeneratorPrivate *priv = generator->priv;
gboolean pretty = priv->pretty;
guint indent = priv->indent;
- GValue value = { 0, };
+ const JsonValue *value;
GString *buffer;
buffer = g_string_new ("");
g_string_append_printf (buffer, "\"%s\":", name);
}
- json_node_get_value (node, &value);
+ value = node->data.value;
- switch (G_VALUE_TYPE (&value))
+ switch (value->type)
{
- case G_TYPE_INT64:
- g_string_append_printf (buffer, "%" G_GINT64_FORMAT, g_value_get_int64 (&value));
+ case JSON_VALUE_INT:
+ g_string_append_printf (buffer, "%" G_GINT64_FORMAT, json_value_get_int (value));
break;
- case G_TYPE_STRING:
+ case JSON_VALUE_STRING:
{
gchar *tmp;
- tmp = json_strescape (g_value_get_string (&value));
- g_string_append_printf (buffer, "\"%s\"", tmp);
+ tmp = json_strescape (json_value_get_string (value));
+ g_string_append_c (buffer, '"');
+ g_string_append (buffer, tmp);
+ g_string_append_c (buffer, '"');
g_free (tmp);
}
break;
- case G_TYPE_DOUBLE:
+ case JSON_VALUE_DOUBLE:
{
gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
g_string_append (buffer,
g_ascii_dtostr (buf, sizeof (buf),
- g_value_get_double (&value)));
+ json_value_get_double (value)));
}
break;
- case G_TYPE_BOOLEAN:
- g_string_append_printf (buffer, "%s",
- g_value_get_boolean (&value) ? "true" : "false");
+ case JSON_VALUE_BOOLEAN:
+ g_string_append (buffer, json_value_get_boolean (value) ? "true" : "false");
+ break;
+
+ case JSON_VALUE_NULL:
+ g_string_append (buffer, "null");
break;
default:
break;
}
- g_value_unset (&value);
-
if (length)
*length = buffer->len;
-json_array_add_array_element\r
-json_array_add_boolean_element\r
-json_array_add_double_element\r
-json_array_add_element\r
-json_array_add_int_element\r
-json_array_add_null_element\r
-json_array_add_object_element\r
-json_array_add_string_element\r
-json_array_dup_element\r
-json_array_foreach_element\r
-json_array_get_array_element\r
-json_array_get_boolean_element\r
-json_array_get_double_element\r
-json_array_get_element\r
-json_array_get_elements\r
-json_array_get_int_element\r
-json_array_get_length\r
-json_array_get_null_element\r
-json_array_get_object_element\r
-json_array_get_string_element\r
-json_array_get_type\r
-json_array_new\r
-json_array_ref\r
-json_array_remove_element\r
-json_array_sized_new\r
-json_array_unref\r
-json_boxed_can_deserialize\r
-json_boxed_can_serialize\r
-json_boxed_deserialize\r
-json_boxed_register_deserialize_func\r
-json_boxed_register_serialize_func\r
-json_boxed_serialize\r
-json_builder_add_boolean_value\r
-json_builder_add_double_value\r
-json_builder_add_int_value\r
-json_builder_add_null_value\r
-json_builder_add_string_value\r
-json_builder_add_value\r
-json_builder_begin_array\r
-json_builder_begin_object\r
-json_builder_end_array\r
-json_builder_end_object\r
-json_builder_get_root\r
-json_builder_get_type\r
-json_builder_new\r
-json_builder_reset\r
-json_builder_set_member_name\r
-json_construct_gobject\r
-json_deserialize_pspec\r
-json_generator_get_indent\r
-json_generator_get_indent_char\r
-json_generator_get_pretty\r
-json_generator_get_root\r
-json_generator_get_type\r
-json_generator_new\r
-json_generator_set_indent\r
-json_generator_set_indent_char\r
-json_generator_set_pretty\r
-json_generator_set_root\r
-json_generator_to_data\r
-json_generator_to_file\r
-json_generator_to_stream\r
-json_gobject_deserialize\r
-json_gobject_from_data\r
-json_gobject_serialize\r
-json_gobject_to_data\r
-json_gvariant_deserialize\r
-json_gvariant_deserialize_data\r
-json_gvariant_serialize\r
-json_gvariant_serialize_data\r
-json_node_copy\r
-json_node_dup_array\r
-json_node_dup_object\r
-json_node_dup_string\r
-json_node_free\r
-json_node_get_array\r
-json_node_get_boolean\r
-json_node_get_double\r
-json_node_get_int\r
-json_node_get_node_type\r
-json_node_get_object\r
-json_node_get_parent\r
-json_node_get_string\r
-json_node_get_type\r
-json_node_get_value\r
-json_node_get_value_type\r
-json_node_is_null\r
-json_node_new\r
-json_node_set_array\r
-json_node_set_boolean\r
-json_node_set_double\r
-json_node_set_int\r
-json_node_set_object\r
-json_node_set_parent\r
-json_node_set_string\r
-json_node_set_value\r
-json_node_take_array\r
-json_node_take_object\r
-json_node_type_get_type\r
-json_node_type_name\r
-json_object_add_member\r
-json_object_dup_member\r
-json_object_foreach_member\r
-json_object_get_array_member\r
-json_object_get_boolean_member\r
-json_object_get_double_member\r
-json_object_get_int_member\r
-json_object_get_member\r
-json_object_get_members\r
-json_object_get_null_member\r
-json_object_get_object_member\r
-json_object_get_size\r
-json_object_get_string_member\r
-json_object_get_type\r
-json_object_get_values\r
-json_object_has_member\r
-json_object_new\r
-json_object_ref\r
-json_object_remove_member\r
-json_object_set_array_member\r
-json_object_set_boolean_member\r
-json_object_set_double_member\r
-json_object_set_int_member\r
-json_object_set_member\r
-json_object_set_null_member\r
-json_object_set_object_member\r
-json_object_set_string_member\r
-json_object_unref\r
-json_parser_error_get_type\r
-json_parser_error_quark\r
-json_parser_get_current_line\r
-json_parser_get_current_pos\r
-json_parser_get_root\r
-json_parser_get_type\r
-json_parser_has_assignment\r
-json_parser_load_from_data\r
-json_parser_load_from_file\r
-json_parser_load_from_stream\r
-json_parser_load_from_stream_async\r
-json_parser_load_from_stream_finish\r
-json_parser_new\r
-json_path_compile\r
-json_path_error_get_type\r
-json_path_error_quark\r
-json_path_get_type\r
-json_path_match\r
-json_path_new\r
-json_path_query\r
-json_reader_count_elements\r
-json_reader_count_members\r
-json_reader_end_element\r
-json_reader_end_member\r
-json_reader_error_get_type\r
-json_reader_error_quark\r
-json_reader_get_boolean_value\r
-json_reader_get_double_value\r
-json_reader_get_error\r
-json_reader_get_int_value\r
-json_reader_get_member_name\r
-json_reader_get_null_value\r
-json_reader_get_string_value\r
-json_reader_get_type\r
-json_reader_get_value\r
-json_reader_list_members\r
-json_reader_is_array\r
-json_reader_is_object\r
-json_reader_is_value\r
-json_reader_new\r
-json_reader_read_element\r
-json_reader_read_member\r
-json_reader_set_root\r
-json_serializable_find_property\r
-json_serializable_get_property\r
-json_serializable_default_deserialize_property\r
-json_serializable_default_serialize_property\r
-json_serializable_deserialize_property\r
-json_serializable_list_properties\r
-json_serializable_get_type\r
-json_serializable_set_property\r
-json_serialize_gobject\r
-json_serializable_serialize_property\r
-json_serialize_pspec\r
+json_array_add_array_element
+json_array_add_boolean_element
+json_array_add_double_element
+json_array_add_element
+json_array_add_int_element
+json_array_add_null_element
+json_array_add_object_element
+json_array_add_string_element
+json_array_dup_element
+json_array_foreach_element
+json_array_get_array_element
+json_array_get_boolean_element
+json_array_get_double_element
+json_array_get_element
+json_array_get_elements
+json_array_get_int_element
+json_array_get_length
+json_array_get_null_element
+json_array_get_object_element
+json_array_get_string_element
+json_array_get_type
+json_array_new
+json_array_ref
+json_array_remove_element
+json_array_sized_new
+json_array_unref
+json_boxed_can_deserialize
+json_boxed_can_serialize
+json_boxed_deserialize
+json_boxed_register_deserialize_func
+json_boxed_register_serialize_func
+json_boxed_serialize
+json_builder_add_boolean_value
+json_builder_add_double_value
+json_builder_add_int_value
+json_builder_add_null_value
+json_builder_add_string_value
+json_builder_add_value
+json_builder_begin_array
+json_builder_begin_object
+json_builder_end_array
+json_builder_end_object
+json_builder_get_root
+json_builder_get_type
+json_builder_new
+json_builder_reset
+json_builder_set_member_name
+json_construct_gobject
+json_deserialize_pspec
+json_generator_get_indent
+json_generator_get_indent_char
+json_generator_get_pretty
+json_generator_get_root
+json_generator_get_type
+json_generator_new
+json_generator_set_indent
+json_generator_set_indent_char
+json_generator_set_pretty
+json_generator_set_root
+json_generator_to_data
+json_generator_to_file
+json_generator_to_stream
+json_gobject_deserialize
+json_gobject_from_data
+json_gobject_serialize
+json_gobject_to_data
+json_gvariant_deserialize
+json_gvariant_deserialize_data
+json_gvariant_serialize
+json_gvariant_serialize_data
+json_node_alloc
+json_node_copy
+json_node_dup_array
+json_node_dup_object
+json_node_dup_string
+json_node_free
+json_node_get_array
+json_node_get_boolean
+json_node_get_double
+json_node_get_int
+json_node_get_node_type
+json_node_get_object
+json_node_get_parent
+json_node_get_string
+json_node_get_type
+json_node_get_value
+json_node_get_value_type
+json_node_init
+json_node_init_array
+json_node_init_boolean
+json_node_init_double
+json_node_init_int
+json_node_init_null
+json_node_init_object
+json_node_init_string
+json_node_is_null
+json_node_new
+json_node_set_array
+json_node_set_boolean
+json_node_set_double
+json_node_set_int
+json_node_set_object
+json_node_set_parent
+json_node_set_string
+json_node_set_value
+json_node_take_array
+json_node_take_object
+json_node_type_get_type
+json_node_type_name
+json_object_add_member
+json_object_dup_member
+json_object_foreach_member
+json_object_get_array_member
+json_object_get_boolean_member
+json_object_get_double_member
+json_object_get_int_member
+json_object_get_member
+json_object_get_members
+json_object_get_null_member
+json_object_get_object_member
+json_object_get_size
+json_object_get_string_member
+json_object_get_type
+json_object_get_values
+json_object_has_member
+json_object_new
+json_object_ref
+json_object_remove_member
+json_object_set_array_member
+json_object_set_boolean_member
+json_object_set_double_member
+json_object_set_int_member
+json_object_set_member
+json_object_set_null_member
+json_object_set_object_member
+json_object_set_string_member
+json_object_unref
+json_parser_error_get_type
+json_parser_error_quark
+json_parser_get_current_line
+json_parser_get_current_pos
+json_parser_get_root
+json_parser_get_type
+json_parser_has_assignment
+json_parser_load_from_data
+json_parser_load_from_file
+json_parser_load_from_stream
+json_parser_load_from_stream_async
+json_parser_load_from_stream_finish
+json_parser_new
+json_path_compile
+json_path_error_get_type
+json_path_error_quark
+json_path_get_type
+json_path_match
+json_path_new
+json_path_query
+json_reader_count_elements
+json_reader_count_members
+json_reader_end_element
+json_reader_end_member
+json_reader_error_get_type
+json_reader_error_quark
+json_reader_get_boolean_value
+json_reader_get_double_value
+json_reader_get_error
+json_reader_get_int_value
+json_reader_get_member_name
+json_reader_get_null_value
+json_reader_get_string_value
+json_reader_get_type
+json_reader_get_value
+json_reader_is_array
+json_reader_is_object
+json_reader_is_value
+json_reader_list_members
+json_reader_new
+json_reader_read_element
+json_reader_read_member
+json_reader_set_root
+json_serializable_default_deserialize_property
+json_serializable_default_serialize_property
+json_serializable_deserialize_property
+json_serializable_find_property
+json_serializable_get_property
+json_serializable_get_type
+json_serializable_list_properties
+json_serializable_serialize_property
+json_serializable_set_property
+json_serialize_gobject
+json_serialize_pspec
if (deserialize_property)
{
JSON_NOTE (GOBJECT, "Using JsonSerializable for property '%s'", pspec->name);
- res = iface->deserialize_property (serializable, pspec->name,
- &value,
- pspec,
- val);
+ res = json_serializable_deserialize_property (serializable,
+ pspec->name,
+ &value,
+ pspec,
+ val);
}
if (!res)
*/
if (serialize_property)
{
- node = iface->serialize_property (serializable, pspec->name,
- &value,
- pspec);
+ node = json_serializable_serialize_property (serializable,
+ pspec->name,
+ &value,
+ pspec);
}
/* skip if the value is the default for the property */
else if (!g_param_value_defaults (pspec, &value))
GParamSpec *pspec)
{
JsonNode *retval = NULL;
- GValue value = { 0, };
JsonNodeType node_type;
switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (real_value)))
{
+ /* JSON native types */
case G_TYPE_INT64:
+ retval = json_node_init_int (json_node_alloc (), g_value_get_int64 (real_value));
+ break;
+
case G_TYPE_BOOLEAN:
+ retval = json_node_init_boolean (json_node_alloc (), g_value_get_boolean (real_value));
+ break;
+
case G_TYPE_DOUBLE:
- /* JSON native types */
- retval = json_node_new (JSON_NODE_VALUE);
- g_value_init (&value, G_VALUE_TYPE (real_value));
- g_value_copy (real_value, &value);
- json_node_set_value (retval, &value);
- g_value_unset (&value);
+ retval = json_node_init_double (json_node_alloc (), g_value_get_double (real_value));
break;
case G_TYPE_STRING:
- /* strings might be NULL, so we handle it differently */
- if (!g_value_get_string (real_value))
- retval = json_node_new (JSON_NODE_NULL);
- else
- {
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_string (retval, g_value_get_string (real_value));
- break;
- }
+ retval = json_node_init_string (json_node_alloc (), g_value_get_string (real_value));
break;
+ /* auto-promoted types */
case G_TYPE_INT:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (retval, g_value_get_int (real_value));
+ retval = json_node_init_int (json_node_alloc (), g_value_get_int (real_value));
+ break;
+
+ case G_TYPE_UINT:
+ retval = json_node_init_int (json_node_alloc (), g_value_get_uint (real_value));
+ break;
+
+ case G_TYPE_LONG:
+ retval = json_node_init_int (json_node_alloc (), g_value_get_long (real_value));
+ break;
+
+ case G_TYPE_ULONG:
+ retval = json_node_init_int (json_node_alloc (), g_value_get_ulong (real_value));
break;
case G_TYPE_FLOAT:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_double (retval, g_value_get_float (real_value));
+ retval = json_node_init_double (json_node_alloc (), g_value_get_float (real_value));
+ break;
+
+ case G_TYPE_CHAR:
+ retval = json_node_alloc ();
+#if GLIB_CHECK_VERSION (2, 31, 0)
+ json_node_init_int (retval, g_value_get_schar (real_value));
+#else
+ json_node_init_int (retval, g_value_get_char (real_value));
+#endif
+ break;
+
+ case G_TYPE_UCHAR:
+ retval = json_node_init_int (json_node_alloc (), g_value_get_uchar (real_value));
+ break;
+
+ case G_TYPE_ENUM:
+ retval = json_node_init_int (json_node_alloc (), g_value_get_enum (real_value));
+ break;
+
+ case G_TYPE_FLAGS:
+ retval = json_node_init_int (json_node_alloc (), g_value_get_flags (real_value));
break;
+ /* complex types */
case G_TYPE_BOXED:
if (G_VALUE_HOLDS (real_value, G_TYPE_STRV))
{
json_array_add_element (array, str);
}
- retval = json_node_new (JSON_NODE_ARRAY);
- json_node_take_array (retval, array);
+ retval = json_node_init_array (json_node_alloc (), array);
+ json_array_unref (array);
}
else if (json_boxed_can_serialize (G_VALUE_TYPE (real_value), &node_type))
{
g_type_name (G_VALUE_TYPE (real_value)));
break;
- case G_TYPE_UINT:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (retval, g_value_get_uint (real_value));
- break;
-
- case G_TYPE_LONG:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (retval, g_value_get_long (real_value));
- break;
-
- case G_TYPE_ULONG:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (retval, g_value_get_long (real_value));
- break;
-
- case G_TYPE_CHAR:
- retval = json_node_new (JSON_NODE_VALUE);
-#if GLIB_CHECK_VERSION (2, 31, 0)
- json_node_set_int (retval, g_value_get_schar (real_value));
-#else
- json_node_set_int (retval, g_value_get_char (real_value));
-#endif
- break;
-
- case G_TYPE_UCHAR:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (retval, g_value_get_uchar (real_value));
- break;
-
- case G_TYPE_ENUM:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (retval, g_value_get_enum (real_value));
- break;
-
- case G_TYPE_FLAGS:
- retval = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (retval, g_value_get_flags (real_value));
- break;
-
case G_TYPE_OBJECT:
{
GObject *object = g_value_get_object (real_value);
+ retval = json_node_alloc ();
+
if (object != NULL)
{
- retval = json_node_new (JSON_NODE_OBJECT);
+ json_node_init (retval, JSON_NODE_OBJECT);
json_node_take_object (retval, json_gobject_dump (object));
}
else
- retval = json_node_new (JSON_NODE_NULL);
+ json_node_init_null (retval);
}
break;
* Use json_gvariant_deserialize() and json_gvariant_deserialize_data() to
* obtain the #GVariant value from a #JsonNode tree or directly from a JSON
* string.
+ *
* Since many #GVariant data types cannot be directly represented as
* JSON, a #GVariant type string (signature) should be provided to these
* methods in order to obtain a correct, type-contrained result.
* If @signature is %NULL, the conversion is done based strictly on the types
* in the JSON nodes.
*
- * Return value: (transfer full): A newly created #GVariant compliant with
- * @signature, or %NULL on error
+ * The returned variant has a floating reference that will need to be sunk
+ * by the caller code.
+ *
+ * Return value: (transfer none): A newly created, floating #GVariant
+ * compliant with @signature, or %NULL on error
*
* Since: 0.14
*/
* The string is first converted to a #JsonNode using #JsonParser, and then
* json_gvariant_deserialize() is called.
*
- * Returns: (transfer full): A newly created #GVariant compliant with
- * @signature, or %NULL on error
+ * The returned variant has a floating reference that will need to be sunk
+ * by the caller code.
+ *
+ * Returns: (transfer none): A newly created, floating #GVariant compliant
+ * with @signature, or %NULL on error
*
* Since: 0.14
*/
}
/**
+ * json_node_alloc:
+ *
+ * Allocates a new #JsonNode. Use json_node_init() and its variants
+ * to initialize the returned value.
+ *
+ * Return value: (transfer full): the newly allocated #JsonNode. Use
+ * json_node_free() to free the resources allocated by this function
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_alloc (void)
+{
+ return g_slice_new0 (JsonNode);
+}
+
+static void
+json_node_unset (JsonNode *node)
+{
+ g_assert (node != NULL);
+
+ switch (node->type)
+ {
+ case JSON_NODE_OBJECT:
+ if (node->data.object)
+ json_object_unref (node->data.object);
+ break;
+
+ case JSON_NODE_ARRAY:
+ if (node->data.array)
+ json_array_unref (node->data.array);
+ break;
+
+ case JSON_NODE_VALUE:
+ if (node->data.value)
+ json_value_unref (node->data.value);
+ break;
+
+ case JSON_NODE_NULL:
+ break;
+ }
+}
+
+/**
+ * json_node_init:
+ * @node: the #JsonNode to initialize
+ * @type: the type of JSON node to initialize @node to
+ *
+ * Initializes a @node to a specific @type.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init (JsonNode *node,
+ JsonNodeType type)
+{
+ g_return_val_if_fail (type >= JSON_NODE_OBJECT &&
+ type <= JSON_NODE_NULL, NULL);
+
+ json_node_unset (node);
+
+ node->type = type;
+
+ return node;
+}
+
+/**
+ * json_node_init_object:
+ * @node: the #JsonNode to initialize
+ * @object: (allow-none): the #JsonObject to initialize @node with, or %NULL
+ *
+ * Initializes @node to %JSON_NODE_OBJECT and sets @object into it.
+ *
+ * This function will take a reference on @object.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init_object (JsonNode *node,
+ JsonObject *object)
+{
+ g_return_val_if_fail (node != NULL, NULL);
+
+ json_node_init (node, JSON_NODE_OBJECT);
+ json_node_set_object (node, object);
+
+ return node;
+}
+
+/**
+ * json_node_init_array:
+ * @node: the #JsonNode to initialize
+ * @array: (allow-none): the #JsonArray to initialize @node with, or %NULL
+ *
+ * Initializes @node to %JSON_NODE_ARRAY and sets @array into it.
+ *
+ * This function will take a reference on @array.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init_array (JsonNode *node,
+ JsonArray *array)
+{
+ g_return_val_if_fail (node != NULL, NULL);
+
+ json_node_init (node, JSON_NODE_ARRAY);
+ json_node_set_array (node, array);
+
+ return node;
+}
+
+/**
+ * json_node_init_int:
+ * @node: the #JsonNode to initialize
+ * @value: an integer
+ *
+ * Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init_int (JsonNode *node,
+ gint64 value)
+{
+ g_return_val_if_fail (node != NULL, NULL);
+
+ json_node_init (node, JSON_NODE_VALUE);
+ json_node_set_int (node, value);
+
+ return node;
+}
+
+/**
+ * json_node_init_double:
+ * @node: the #JsonNode to initialize
+ * @value: a floating point value
+ *
+ * Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init_double (JsonNode *node,
+ gdouble value)
+{
+ g_return_val_if_fail (node != NULL, NULL);
+
+ json_node_init (node, JSON_NODE_VALUE);
+ json_node_set_double (node, value);
+
+ return node;
+}
+
+/**
+ * json_node_init_boolean:
+ * @node: the #JsonNode to initialize
+ * @value: a boolean value
+ *
+ * Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init_boolean (JsonNode *node,
+ gboolean value)
+{
+ g_return_val_if_fail (node != NULL, NULL);
+
+ json_node_init (node, JSON_NODE_VALUE);
+ json_node_set_boolean (node, value);
+
+ return node;
+}
+
+/**
+ * json_node_init_string:
+ * @node: the #JsonNode to initialize
+ * @value: (allow-none): a string value
+ *
+ * Initializes @node to %JSON_NODE_VALUE and sets @value into it.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init_string (JsonNode *node,
+ const char *value)
+{
+ g_return_val_if_fail (node != NULL, NULL);
+
+ json_node_init (node, JSON_NODE_VALUE);
+ json_node_set_string (node, value);
+
+ return node;
+}
+
+/**
+ * json_node_init_null:
+ * @node: the #JsonNode to initialize
+ *
+ * Initializes @node to %JSON_NODE_NULL.
+ *
+ * If the node has already been initialized once, it will be reset to
+ * the given type, and any data contained will be cleared.
+ *
+ * Return value: (transfer none): the initialized #JsonNode
+ *
+ * Since: 0.16
+ */
+JsonNode *
+json_node_init_null (JsonNode *node)
+{
+ g_return_val_if_fail (node != NULL, NULL);
+
+ return json_node_init (node, JSON_NODE_NULL);
+}
+
+/**
* json_node_new:
* @type: a #JsonNodeType
*
* Creates a new #JsonNode of @type.
*
+ * This is a convenience function for json_node_alloc() and json_node_init(),
+ * and it's the equivalent of:
+ *
+ * |[
+ * return json_node_init (json_node_alloc (), type);
+ * ]|
+ *
* Return value: the newly created #JsonNode
*/
JsonNode *
json_node_new (JsonNodeType type)
{
- JsonNode *data;
-
g_return_val_if_fail (type >= JSON_NODE_OBJECT &&
type <= JSON_NODE_NULL, NULL);
- data = g_slice_new0 (JsonNode);
- data->type = type;
-
- return data;
+ return json_node_init (json_node_alloc (), type);
}
/**
/**
* json_node_set_object:
- * @node: a #JsonNode
+ * @node: a #JsonNode initialized to %JSON_NODE_OBJECT
* @object: a #JsonObject
*
* Sets @objects inside @node. The reference count of @object is increased.
g_return_if_fail (node != NULL);
g_return_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_OBJECT);
- if (node->data.object)
+ if (node->data.object != NULL)
json_object_unref (node->data.object);
if (object)
/**
* json_node_take_object:
- * @node: a #JsonNode
+ * @node: a #JsonNode initialized to %JSON_NODE_OBJECT
* @object: (transfer full): a #JsonObject
*
* Sets @object inside @node. The reference count of @object is not increased.
/**
* json_node_set_array:
- * @node: a #JsonNode
+ * @node: a #JsonNode initialized to %JSON_NODE_ARRAY
* @array: a #JsonArray
*
* Sets @array inside @node and increases the #JsonArray reference count
/**
* json_node_take_array:
- * @node: a #JsonNode
+ * @node: a #JsonNode initialized to %JSON_NODE_ARRAY
* @array: (transfer full): a #JsonArray
*
* Sets @array into @node without increasing the #JsonArray reference count.
/**
* json_node_set_value:
- * @node: a #JsonNode
+ * @node: a #JsonNode initialized to %JSON_NODE_VALUE
* @value: the #GValue to set
*
* Sets @value inside @node. The passed #GValue is copied into the #JsonNode
{
if (G_LIKELY (node))
{
- switch (node->type)
- {
- case JSON_NODE_OBJECT:
- if (node->data.object)
- json_object_unref (node->data.object);
- break;
-
- case JSON_NODE_ARRAY:
- if (node->data.array)
- json_array_unref (node->data.array);
- break;
-
- case JSON_NODE_VALUE:
- if (node->data.value)
- json_value_unref (node->data.value);
- break;
-
- case JSON_NODE_NULL:
- break;
- }
-
+ json_node_unset (node);
g_slice_free (JsonNode, node);
}
}
/**
* json_node_set_string:
- * @node: a #JsonNode of type %JSON_NODE_VALUE
+ * @node: a #JsonNode initialized to %JSON_NODE_VALUE
* @value: a string value
*
* Sets @value as the string content of the @node, replacing any existing
if (JSON_VALUE_HOLDS_INT (node->data.value))
return json_value_get_int (node->data.value);
+ if (JSON_VALUE_HOLDS_DOUBLE (node->data.value))
+ return json_value_get_double (node->data.value);
+
+ if (JSON_VALUE_HOLDS_BOOLEAN (node->data.value))
+ return json_value_get_boolean (node->data.value);
+
return 0;
}
if (JSON_VALUE_HOLDS_DOUBLE (node->data.value))
return json_value_get_double (node->data.value);
+ if (JSON_VALUE_HOLDS_INT (node->data.value))
+ return (gdouble) json_value_get_int (node->data.value);
+
+ if (JSON_VALUE_HOLDS_BOOLEAN (node->data.value))
+ return (gdouble) json_value_get_boolean (node->data.value);
+
return 0.0;
}
if (JSON_VALUE_HOLDS_BOOLEAN (node->data.value))
return json_value_get_boolean (node->data.value);
+ if (JSON_VALUE_HOLDS_INT (node->data.value))
+ return json_value_get_int (node->data.value) != 0;
+
+ if (JSON_VALUE_HOLDS_DOUBLE (node->data.value))
+ return json_value_get_double (node->data.value) != 0.0;
+
return FALSE;
}
const gchar *member_name,
gint64 value)
{
- JsonNode *node;
-
g_return_if_fail (object != NULL);
g_return_if_fail (member_name != NULL);
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (node, value);
- object_set_member_internal (object, member_name, node);
+ object_set_member_internal (object, member_name, json_node_init_int (json_node_alloc (), value));
}
/**
const gchar *member_name,
gdouble value)
{
- JsonNode *node;
-
g_return_if_fail (object != NULL);
g_return_if_fail (member_name != NULL);
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_double (node, value);
- object_set_member_internal (object, member_name, node);
+ object_set_member_internal (object, member_name, json_node_init_double (json_node_alloc (), value));
}
/**
const gchar *member_name,
gboolean value)
{
- JsonNode *node;
-
g_return_if_fail (object != NULL);
g_return_if_fail (member_name != NULL);
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_boolean (node, value);
- object_set_member_internal (object, member_name, node);
+ object_set_member_internal (object, member_name, json_node_init_boolean (json_node_alloc (), value));
}
/**
g_return_if_fail (object != NULL);
g_return_if_fail (member_name != NULL);
+ node = json_node_alloc ();
+
if (value != NULL)
- {
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_string (node, value);
- }
+ json_node_init_string (node, value);
else
- node = json_node_new (JSON_NODE_NULL);
+ json_node_init_null (node);
object_set_member_internal (object, member_name, node);
}
json_object_set_null_member (JsonObject *object,
const gchar *member_name)
{
- JsonNode *node;
-
g_return_if_fail (object != NULL);
g_return_if_fail (member_name != NULL);
- node = json_node_new (JSON_NODE_NULL);
- object_set_member_internal (object, member_name, node);
+ object_set_member_internal (object, member_name, json_node_init_null (json_node_alloc ()));
}
/**
g_return_if_fail (object != NULL);
g_return_if_fail (member_name != NULL);
+ node = json_node_alloc ();
+
if (value != NULL)
{
- node = json_node_new (JSON_NODE_ARRAY);
- json_node_take_array (node, value);
+ json_node_init_array (node, value);
+ json_array_unref (value);
}
else
- node = json_node_new (JSON_NODE_NULL);
+ json_node_init_null (node);
object_set_member_internal (object, member_name, node);
}
g_return_if_fail (object != NULL);
g_return_if_fail (member_name != NULL);
+ node = json_node_alloc ();
+
if (value != NULL)
{
- node = json_node_new (JSON_NODE_OBJECT);
- json_node_take_object (node, value);
+ json_node_init_object (node, value);
+ json_object_unref (value);
}
else
- node = json_node_new (JSON_NODE_NULL);
+ json_node_init_null (node);
object_set_member_internal (object, member_name, node);
}
node = object_get_member_internal (object, member_name);
g_return_val_if_fail (node != NULL, FALSE);
- return JSON_NODE_TYPE (node) == JSON_NODE_NULL;
+ if (JSON_NODE_HOLDS_NULL (node))
+ return TRUE;
+
+ if (JSON_NODE_HOLDS_OBJECT (node))
+ return json_node_get_object (node) == NULL;
+
+ if (JSON_NODE_HOLDS_ARRAY (node))
+ return json_node_get_array (node) == NULL;
+
+ return FALSE;
}
/**
switch (token)
{
case G_TOKEN_INT:
- *node = json_node_new (JSON_NODE_VALUE);
JSON_NOTE (PARSER, "abs(node): %" G_GINT64_FORMAT " (sign: %s)",
scanner->value.v_int64,
is_negative ? "negative" : "positive");
- json_node_set_int (*node, is_negative ? scanner->value.v_int64 * -1
- : scanner->value.v_int64);
+ *node = json_node_init_int (json_node_alloc (),
+ is_negative ? scanner->value.v_int64 * -1
+ : scanner->value.v_int64);
break;
case G_TOKEN_FLOAT:
- *node = json_node_new (JSON_NODE_VALUE);
JSON_NOTE (PARSER, "abs(node): %.6f (sign: %s)",
scanner->value.v_float,
is_negative ? "negative" : "positive");
- json_node_set_double (*node, is_negative ? scanner->value.v_float * -1.0
- : scanner->value.v_float);
+ *node = json_node_init_double (json_node_alloc (),
+ is_negative ? scanner->value.v_float * -1.0
+ : scanner->value.v_float);
break;
case G_TOKEN_STRING:
- *node = json_node_new (JSON_NODE_VALUE);
JSON_NOTE (PARSER, "node: '%s'",
scanner->value.v_string);
- json_node_set_string (*node, scanner->value.v_string);
+ *node = json_node_init_string (json_node_alloc (), scanner->value.v_string);
break;
case JSON_TOKEN_TRUE:
case JSON_TOKEN_FALSE:
- *node = json_node_new (JSON_NODE_VALUE);
JSON_NOTE (PARSER, "node: '%s'",
JSON_TOKEN_TRUE ? "<true>" : "<false>");
- json_node_set_boolean (*node, token == JSON_TOKEN_TRUE ? TRUE : FALSE);
+ *node = json_node_init_boolean (json_node_alloc (), token == JSON_TOKEN_TRUE ? TRUE : FALSE);
break;
case JSON_TOKEN_NULL:
- *node = json_node_new (JSON_NODE_NULL);
JSON_NOTE (PARSER, "node: <null>");
+ *node = json_node_init_null (json_node_alloc ());
break;
+ case G_TOKEN_IDENTIFIER:
+ JSON_NOTE (PARSER, "node: identifier '%s'", scanner->value.v_identifier);
+ priv->error_code = JSON_PARSER_ERROR_INVALID_BAREWORD;
+ *node = NULL;
+ return G_TOKEN_SYMBOL;
+
default:
{
JsonNodeType cur_type;
*node = NULL;
+ JSON_NOTE (PARSER, "node: invalid token");
+
cur_type = json_node_get_node_type (current_node);
if (cur_type == JSON_NODE_ARRAY)
- return G_TOKEN_RIGHT_BRACE;
+ {
+ priv->error_code = JSON_PARSER_ERROR_PARSE;
+ return G_TOKEN_RIGHT_BRACE;
+ }
else if (cur_type == JSON_NODE_OBJECT)
- return G_TOKEN_RIGHT_CURLY;
+ {
+ priv->error_code = JSON_PARSER_ERROR_PARSE;
+ return G_TOKEN_RIGHT_CURLY;
+ }
else
{
priv->error_code = JSON_PARSER_ERROR_INVALID_BAREWORD;
return G_TOKEN_SYMBOL;
}
}
+ break;
}
return G_TOKEN_NONE;
gint idx;
old_current = priv->current_node;
- priv->current_node = json_node_new (JSON_NODE_ARRAY);
+ priv->current_node = json_node_init_array (json_node_alloc (), NULL);
array = json_array_new ();
token = json_parse_object (parser, scanner, &element);
break;
- case G_TOKEN_INT:
- case G_TOKEN_FLOAT:
- case G_TOKEN_STRING:
- case '-':
- case JSON_TOKEN_TRUE:
- case JSON_TOKEN_FALSE:
- case JSON_TOKEN_NULL:
- token = json_scanner_get_next_token (scanner);
- token = json_parse_value (parser, scanner, token, &element);
- break;
-
case G_TOKEN_RIGHT_BRACE:
goto array_done;
default:
- if (next_token != G_TOKEN_RIGHT_BRACE)
- token = G_TOKEN_RIGHT_BRACE;
+ token = json_scanner_get_next_token (scanner);
+ token = json_parse_value (parser, scanner, token, &element);
break;
}
guint token;
old_current = priv->current_node;
- priv->current_node = json_node_new (JSON_NODE_OBJECT);
+ priv->current_node = json_node_init_object (json_node_alloc (), NULL);
object = json_object_new ();
{
JSON_NOTE (PARSER, "Missing object member name");
- priv->error_code = JSON_PARSER_ERROR_PARSE;
+ priv->error_code = JSON_PARSER_ERROR_INVALID_BAREWORD;
json_object_unref (object);
json_node_free (priv->current_node);
/* member name */
token = json_scanner_get_next_token (scanner);
name = g_strdup (scanner->value.v_string);
+ if (name == NULL || *name == '\0')
+ {
+ JSON_NOTE (PARSER, "Empty object member name");
+
+ priv->error_code = JSON_PARSER_ERROR_EMPTY_MEMBER_NAME;
+
+ json_object_unref (object);
+ json_node_free (priv->current_node);
+ priv->current_node = old_current;
+
+ return G_TOKEN_STRING;
+ }
+
JSON_NOTE (PARSER, "Object member '%s'", name);
/* a colon separates names from values */
token = json_parse_object (parser, scanner, &member);
break;
- case G_TOKEN_INT:
- case G_TOKEN_FLOAT:
- case G_TOKEN_STRING:
- case '-':
- case JSON_TOKEN_TRUE:
- case JSON_TOKEN_FALSE:
- case JSON_TOKEN_NULL:
- token = json_scanner_get_next_token (scanner);
- token = json_parse_value (parser, scanner, token, &member);
- break;
-
default:
/* once a member name is defined we need a value */
- token = G_TOKEN_SYMBOL;
+ token = json_scanner_get_next_token (scanner);
+ token = json_parse_value (parser, scanner, token, &member);
break;
}
/* ... and finally swallow the '=' */
next_token = json_scanner_get_next_token (scanner);
if (next_token != '=')
- return '=';
+ {
+ priv->error_code = JSON_PARSER_ERROR_INVALID_BAREWORD;
+ g_free (name);
+ return '=';
+ }
priv->has_assignment = TRUE;
priv->variable_name = name;
case G_TOKEN_INT:
case G_TOKEN_FLOAT:
case G_TOKEN_STRING:
+ case G_TOKEN_IDENTIFIER:
JSON_NOTE (PARSER, "Statement is a value");
token = json_scanner_get_next_token (scanner);
return json_parse_value (parser, scanner, token, &priv->root);
static void
json_scanner_msg_handler (JsonScanner *scanner,
- gchar *message,
- gboolean is_error)
+ gchar *message)
{
JsonParser *parser = scanner->user_data;
JsonParserPrivate *priv = parser->priv;
+ GError *error = NULL;
- if (is_error)
- {
- GError *error = NULL;
-
- /* translators: %s: is the file name, %d is the line number
- * and %s is the error message
- */
- g_set_error (&error, JSON_PARSER_ERROR,
- priv->error_code,
- _("%s:%d: Parse error: %s"),
- priv->is_filename ? priv->filename : "<none>",
- scanner->line,
- message);
-
- parser->priv->last_error = error;
- g_signal_emit (parser, parser_signals[ERROR], 0, error);
- }
- else
- g_warning ("%s:%d: Parse error: %s",
- priv->is_filename ? priv->filename : "<none>",
+ /* translators: %s: is the file name, the first %d is the line
+ * number, the second %d is the position on the line, and %s is
+ * the error message
+ */
+ g_set_error (&error, JSON_PARSER_ERROR,
+ priv->error_code,
+ _("%s:%d:%d: Parse error: %s"),
+ priv->is_filename ? priv->filename : "<data>",
scanner->line,
+ scanner->position,
message);
+
+ parser->priv->last_error = error;
+ g_signal_emit (parser, parser_signals[ERROR], 0, error);
}
static JsonScanner *
scanner->msg_handler = json_scanner_msg_handler;
scanner->user_data = parser;
+ /* XXX: this is eminently stupid, but we use the symbols later on, so
+ * we cannot move them into JsonScanner without moving a bunch of code
+ * as well
+ */
for (i = 0; i < n_symbols; i++)
{
json_scanner_scope_add_symbol (scanner, 0,
*/
json_scanner_unexp_token (scanner, expected_token,
NULL, "value",
- symbol_name, msg,
- TRUE);
+ symbol_name, msg);
/* and this will propagate the error we create in the
* same message handler
{
g_return_val_if_fail (JSON_IS_PARSER (parser), 0);
- if (parser->priv->scanner)
- return json_scanner_cur_line (parser->priv->scanner);
+ if (parser->priv->scanner != NULL)
+ return parser->priv->scanner->line;
return 0;
}
{
g_return_val_if_fail (JSON_IS_PARSER (parser), 0);
- if (parser->priv->scanner)
- return json_scanner_cur_line (parser->priv->scanner);
+ if (parser->priv->scanner != NULL)
+ return parser->priv->scanner->position;
return 0;
}
* @JSON_PARSER_ERROR_MISSING_COMMA: expected comma
* @JSON_PARSER_ERROR_MISSING_COLON: expected colon
* @JSON_PARSER_ERROR_INVALID_BAREWORD: invalid bareword
+ * @JSON_PARSER_ERROR_EMPTY_MEMBER_NAME: empty member name (Since: 0.16)
* @JSON_PARSER_ERROR_UNKNOWN: unknown error
*
* Error enumeration for #JsonParser
JSON_PARSER_ERROR_MISSING_COMMA,
JSON_PARSER_ERROR_MISSING_COLON,
JSON_PARSER_ERROR_INVALID_BAREWORD,
-
+ JSON_PARSER_ERROR_EMPTY_MEMBER_NAME,
+
JSON_PARSER_ERROR_UNKNOWN
} JsonParserError;
else
{
JSON_NOTE (PATH, "glob match member '%s'", (char *) l->data);
- json_array_add_element (results, json_node_copy (root));
+ json_array_add_element (results, json_node_copy (member));
}
}
g_list_free (members);
else
{
JSON_NOTE (PATH, "glob match element '%d'", i);
- json_array_add_element (results, json_node_copy (root));
+ json_array_add_element (results, json_node_copy (element));
}
}
g_list_free (elements);
if (reader->priv->current_node == NULL)
return FALSE;
- return JSON_NODE_HOLDS_VALUE (reader->priv->current_node);
+ return JSON_NODE_HOLDS_VALUE (reader->priv->current_node) ||
+ JSON_NODE_HOLDS_NULL (reader->priv->current_node);
}
/**
return 0;
}
- if (json_node_get_value_type (node) != G_TYPE_INT64)
- {
- json_reader_set_error (reader, JSON_READER_ERROR_INVALID_TYPE,
- _("The current position does not hold an integer type"));
- return 0;
- }
-
return json_node_get_int (reader->priv->current_node);
}
return 0.0;
}
- if (json_node_get_value_type (node) != G_TYPE_DOUBLE)
- {
- json_reader_set_error (reader, JSON_READER_ERROR_INVALID_TYPE,
- _("The current position does not hold a floating point type"));
- return 0.0;
- }
-
return json_node_get_double (reader->priv->current_node);
}
return FALSE;
}
- if (json_node_get_value_type (node) != G_TYPE_BOOLEAN)
- {
- json_reader_set_error (reader, JSON_READER_ERROR_INVALID_TYPE,
- _("The current position does not hold a boolean type"));
- return FALSE;
- }
-
return json_node_get_boolean (node);
}
static gunichar json_scanner_get_unichar (JsonScanner *scanner,
guint *line_p,
guint *position_p);
-static void json_scanner_msg_handler (JsonScanner *scanner,
- gchar *message,
- gboolean is_error);
/* --- functions --- */
static inline gint
scanner->symbol_table = g_hash_table_new (json_scanner_key_hash,
json_scanner_key_equal);
- scanner->input_fd = -1;
scanner->text = NULL;
scanner->text_end = NULL;
scanner->buffer = NULL;
scanner->scope_id = 0;
- scanner->msg_handler = json_scanner_msg_handler;
-
return scanner;
}
g_free (scanner);
}
-static void
-json_scanner_msg_handler (JsonScanner *scanner,
- gchar *message,
- gboolean is_error)
-{
- g_return_if_fail (scanner != NULL);
-
- g_fprintf (stderr, "%s:%d: ",
- scanner->input_name ? scanner->input_name : "<memory>",
- scanner->line);
- if (is_error)
- g_fprintf (stderr, "error: ");
-
- g_fprintf (stderr, "%s\n", message);
-}
-
void
json_scanner_error (JsonScanner *scanner,
const gchar *format,
string = g_strdup_vprintf (format, args);
va_end (args);
- scanner->msg_handler (scanner, string, TRUE);
-
- g_free (string);
- }
-}
-
-void
-json_scanner_warn (JsonScanner *scanner,
- const gchar *format,
- ...)
-{
- g_return_if_fail (scanner != NULL);
- g_return_if_fail (format != NULL);
-
- if (scanner->msg_handler)
- {
- va_list args;
- gchar *string;
-
- va_start (args, format);
- string = g_strdup_vprintf (format, args);
- va_end (args);
-
- scanner->msg_handler (scanner, string, FALSE);
+ scanner->msg_handler (scanner, string);
g_free (string);
}
key->value = value;
}
-void
-json_scanner_scope_remove_symbol (JsonScanner *scanner,
- guint scope_id,
- const gchar *symbol)
-{
- JsonScannerKey *key;
-
- g_return_if_fail (scanner != NULL);
- g_return_if_fail (symbol != NULL);
-
- key = json_scanner_lookup_internal (scanner, scope_id, symbol);
- if (key)
- {
- g_hash_table_remove (scanner->symbol_table, key);
- g_free (key->symbol);
- g_slice_free (JsonScannerKey, key);
- }
-}
-
-gpointer
-json_scanner_lookup_symbol (JsonScanner *scanner,
- const gchar *symbol)
-{
- JsonScannerKey *key;
- guint scope_id;
-
- g_return_val_if_fail (scanner != NULL, NULL);
-
- if (!symbol)
- return NULL;
-
- scope_id = scanner->scope_id;
- key = json_scanner_lookup_internal (scanner, scope_id, symbol);
- if (!key && scope_id && scanner->config->scope_0_fallback)
- key = json_scanner_lookup_internal (scanner, 0, symbol);
-
- if (key)
- return key->value;
- else
- return NULL;
-}
-
-gpointer
-json_scanner_scope_lookup_symbol (JsonScanner *scanner,
- guint scope_id,
- const gchar *symbol)
-{
- JsonScannerKey *key;
-
- g_return_val_if_fail (scanner != NULL, NULL);
-
- if (!symbol)
- return NULL;
-
- key = json_scanner_lookup_internal (scanner, scope_id, symbol);
-
- if (key)
- return key->value;
- else
- return NULL;
-}
-
-guint
-json_scanner_set_scope (JsonScanner *scanner,
- guint scope_id)
-{
- guint old_scope_id;
-
- g_return_val_if_fail (scanner != NULL, 0);
-
- old_scope_id = scanner->scope_id;
- scanner->scope_id = scope_id;
-
- return old_scope_id;
-}
-
-typedef struct {
- GHFunc func;
- gpointer data;
- guint scope_id;
-} ForeachClosure;
-
-static void
-json_scanner_foreach_internal (gpointer _key,
- gpointer _value,
- gpointer _user_data)
-{
- JsonScannerKey *key = _value;
- ForeachClosure *closure = _user_data;
-
- if (key->scope_id == closure->scope_id)
- closure->func (key->symbol, key->value, closure->data);
-}
-
-void
-json_scanner_scope_foreach_symbol (JsonScanner *scanner,
- guint scope_id,
- GHFunc func,
- gpointer user_data)
-{
- ForeachClosure closure;
-
- g_return_if_fail (scanner != NULL);
- g_return_if_fail (func != NULL);
-
- closure.func = func;
- closure.data = user_data;
- closure.scope_id = scope_id;
-
- g_hash_table_foreach (scanner->symbol_table,
- json_scanner_foreach_internal,
- &closure);
-}
-
GTokenType
json_scanner_peek_next_token (JsonScanner *scanner)
{
return scanner->token;
}
-GTokenType
-json_scanner_cur_token (JsonScanner *scanner)
-{
- g_return_val_if_fail (scanner != NULL, G_TOKEN_EOF);
-
- return scanner->token;
-}
-
-GTokenValue
-json_scanner_cur_value (JsonScanner *scanner)
-{
- GTokenValue v;
-
- v.v_int64 = 0;
-
- g_return_val_if_fail (scanner != NULL, v);
-
- /* MSC isn't capable of handling return scanner->value; ? */
-
- v = scanner->value;
-
- return v;
-}
-
-guint
-json_scanner_cur_line (JsonScanner *scanner)
-{
- g_return_val_if_fail (scanner != NULL, 0);
-
- return scanner->line;
-}
-
-guint
-json_scanner_cur_position (JsonScanner *scanner)
-{
- g_return_val_if_fail (scanner != NULL, 0);
-
- return scanner->position;
-}
-
-gboolean
-json_scanner_eof (JsonScanner *scanner)
-{
- g_return_val_if_fail (scanner != NULL, TRUE);
-
- return scanner->token == G_TOKEN_EOF || scanner->token == G_TOKEN_ERROR;
-}
-
-void
-json_scanner_input_file (JsonScanner *scanner,
- gint input_fd)
-{
- g_return_if_fail (scanner != NULL);
- g_return_if_fail (input_fd >= 0);
-
- if (scanner->input_fd >= 0)
- json_scanner_sync_file_offset (scanner);
-
- scanner->token = G_TOKEN_NONE;
- scanner->value.v_int64 = 0;
- scanner->line = 1;
- scanner->position = 0;
- scanner->next_token = G_TOKEN_NONE;
-
- scanner->input_fd = input_fd;
- scanner->text = NULL;
- scanner->text_end = NULL;
-
- if (!scanner->buffer)
- scanner->buffer = g_new (gchar, READ_BUFFER_SIZE + 1);
-}
-
void
json_scanner_input_text (JsonScanner *scanner,
const gchar *text,
else
text = NULL;
- if (scanner->input_fd >= 0)
- json_scanner_sync_file_offset (scanner);
-
scanner->token = G_TOKEN_NONE;
scanner->value.v_int64 = 0;
scanner->line = 1;
scanner->position = 0;
scanner->next_token = G_TOKEN_NONE;
- scanner->input_fd = -1;
scanner->text = text;
scanner->text_end = text + text_len;
{
if (scanner->text < scanner->text_end)
return *scanner->text;
- else if (scanner->input_fd >= 0)
- {
- gint count;
- gchar *buffer;
-
- buffer = scanner->buffer;
- do
- {
- count = read (scanner->input_fd, buffer, READ_BUFFER_SIZE);
- }
- while (count == -1 && (errno == EINTR || errno == EAGAIN));
-
- if (count < 1)
- {
- scanner->input_fd = -1;
-
- return 0;
- }
- else
- {
- scanner->text = buffer;
- scanner->text_end = buffer + count;
-
- return *buffer;
- }
- }
else
return 0;
}
-void
-json_scanner_sync_file_offset (JsonScanner *scanner)
-{
- g_return_if_fail (scanner != NULL);
-
- /* for file input, rewind the filedescriptor to the current
- * buffer position and blow the file read ahead buffer. useful
- * for third party uses of our file descriptor, which hooks
- * onto the current scanning position.
- */
-
- if (scanner->input_fd >= 0 && scanner->text_end > scanner->text)
- {
- gint buffered;
-
- buffered = scanner->text_end - scanner->text;
- if (lseek (scanner->input_fd, - buffered, SEEK_CUR) >= 0)
- {
- /* we succeeded, blow our buffer's contents now */
- scanner->text = NULL;
- scanner->text_end = NULL;
- }
- else
- errno = 0;
- }
-}
-
static guchar
json_scanner_get_char (JsonScanner *scanner,
guint *line_p,
if (scanner->text < scanner->text_end)
fchar = *(scanner->text++);
- else if (scanner->input_fd >= 0)
- {
- gint count;
- gchar *buffer;
-
- buffer = scanner->buffer;
- do
- {
- count = read (scanner->input_fd, buffer, READ_BUFFER_SIZE);
- }
- while (count == -1 && (errno == EINTR || errno == EAGAIN));
-
- if (count < 1)
- {
- scanner->input_fd = -1;
- fchar = 0;
- }
- else
- {
- scanner->text = buffer + 1;
- scanner->text_end = buffer + count;
- fchar = *buffer;
- if (!fchar)
- {
- json_scanner_sync_file_offset (scanner);
- scanner->text_end = scanner->text;
- scanner->input_fd = -1;
- }
- }
- }
else
fchar = 0;
const gchar *identifier_spec,
const gchar *symbol_spec,
const gchar *symbol_name,
- const gchar *message,
- gint is_error)
+ const gchar *message)
{
gchar *token_string;
guint token_string_len;
guint expected_string_len;
gchar *message_prefix;
gboolean print_unexp;
- void (*msg_handler) (JsonScanner*, const gchar*, ...);
g_return_if_fail (scanner != NULL);
- if (is_error)
- msg_handler = json_scanner_error;
- else
- msg_handler = json_scanner_warn;
-
if (!identifier_spec)
identifier_spec = "identifier";
if (!symbol_spec)
}
if (expected_token == G_TOKEN_ERROR)
{
- msg_handler (scanner,
- "failure around %s%s%s",
- token_string,
- message_prefix,
- message);
+ json_scanner_error (scanner,
+ "failure around %s%s%s",
+ token_string,
+ message_prefix,
+ message);
}
else if (expected_token == G_TOKEN_NONE)
{
if (print_unexp)
- msg_handler (scanner,
- "unexpected %s%s%s",
- token_string,
- message_prefix,
- message);
+ json_scanner_error (scanner,
+ "unexpected %s%s%s",
+ token_string,
+ message_prefix,
+ message);
else
- msg_handler (scanner,
- "%s%s%s",
- token_string,
- message_prefix,
- message);
+ json_scanner_error (scanner,
+ "%s%s%s",
+ token_string,
+ message_prefix,
+ message);
}
else
{
if (print_unexp)
- msg_handler (scanner,
- "unexpected %s, expected %s%s%s",
- token_string,
- expected_string,
- message_prefix,
- message);
+ json_scanner_error (scanner,
+ "unexpected %s, expected %s%s%s",
+ token_string,
+ expected_string,
+ message_prefix,
+ message);
else
- msg_handler (scanner,
- "%s, expected %s%s%s",
- token_string,
- expected_string,
- message_prefix,
- message);
+ json_scanner_error (scanner,
+ "%s, expected %s%s%s",
+ token_string,
+ expected_string,
+ message_prefix,
+ message);
}
g_free (token_string);
static void
json_scanner_get_token_i (JsonScanner *scanner,
- GTokenType *token_p,
- GTokenValue *value_p,
- guint *line_p,
- guint *position_p)
+ GTokenType *token_p,
+ GTokenValue *value_p,
+ guint *line_p,
+ guint *position_p)
{
do
{
config = scanner->config;
(*value_p).v_int64 = 0;
- if ((scanner->text >= scanner->text_end && scanner->input_fd < 0) ||
+ if (scanner->text >= scanner->text_end ||
scanner->token == G_TOKEN_EOF)
{
*token_p = G_TOKEN_EOF;
typedef struct _JsonScannerConfig JsonScannerConfig;
typedef void (* JsonScannerMsgFunc) (JsonScanner *scanner,
- gchar *message,
- gboolean is_error);
+ gchar *message);
/**
* JsonTokenType:
/* to be considered private */
GHashTable *symbol_table;
- gint input_fd;
const gchar *text;
const gchar *text_end;
gchar *buffer;
G_GNUC_INTERNAL
void json_scanner_destroy (JsonScanner *scanner);
G_GNUC_INTERNAL
-void json_scanner_input_file (JsonScanner *scanner,
- gint input_fd);
-G_GNUC_INTERNAL
-void json_scanner_sync_file_offset (JsonScanner *scanner);
-G_GNUC_INTERNAL
void json_scanner_input_text (JsonScanner *scanner,
const gchar *text,
guint text_len);
G_GNUC_INTERNAL
GTokenType json_scanner_peek_next_token (JsonScanner *scanner);
G_GNUC_INTERNAL
-GTokenType json_scanner_cur_token (JsonScanner *scanner);
-G_GNUC_INTERNAL
-GTokenValue json_scanner_cur_value (JsonScanner *scanner);
-G_GNUC_INTERNAL
-guint json_scanner_cur_line (JsonScanner *scanner);
-G_GNUC_INTERNAL
-guint json_scanner_cur_position (JsonScanner *scanner);
-G_GNUC_INTERNAL
-gboolean json_scanner_eof (JsonScanner *scanner);
-G_GNUC_INTERNAL
-guint json_scanner_set_scope (JsonScanner *scanner,
- guint scope_id);
-G_GNUC_INTERNAL
void json_scanner_scope_add_symbol (JsonScanner *scanner,
guint scope_id,
const gchar *symbol,
gpointer value);
G_GNUC_INTERNAL
-void json_scanner_scope_remove_symbol (JsonScanner *scanner,
- guint scope_id,
- const gchar *symbol);
-G_GNUC_INTERNAL
-gpointer json_scanner_scope_lookup_symbol (JsonScanner *scanner,
- guint scope_id,
- const gchar *symbol);
-G_GNUC_INTERNAL
-void json_scanner_scope_foreach_symbol (JsonScanner *scanner,
- guint scope_id,
- GHFunc func,
- gpointer user_data);
-G_GNUC_INTERNAL
-gpointer json_scanner_lookup_symbol (JsonScanner *scanner,
- const gchar *symbol);
-G_GNUC_INTERNAL
void json_scanner_unexp_token (JsonScanner *scanner,
GTokenType expected_token,
const gchar *identifier_spec,
const gchar *symbol_spec,
const gchar *symbol_name,
- const gchar *message,
- gint is_error);
+ const gchar *message);
G_GNUC_INTERNAL
void json_scanner_error (JsonScanner *scanner,
const gchar *format,
...) G_GNUC_PRINTF (2,3);
-G_GNUC_INTERNAL
-void json_scanner_warn (JsonScanner *scanner,
- const gchar *format,
- ...) G_GNUC_PRINTF (2,3);
G_END_DECLS
*/
GType json_node_get_type (void) G_GNUC_CONST;
JsonNode * json_node_new (JsonNodeType type);
+
+JsonNode * json_node_alloc (void);
+JsonNode * json_node_init (JsonNode *node,
+ JsonNodeType type);
+JsonNode * json_node_init_object (JsonNode *node,
+ JsonObject *object);
+JsonNode * json_node_init_array (JsonNode *node,
+ JsonArray *array);
+JsonNode * json_node_init_int (JsonNode *node,
+ gint64 value);
+JsonNode * json_node_init_double (JsonNode *node,
+ gdouble value);
+JsonNode * json_node_init_boolean (JsonNode *node,
+ gboolean value);
+JsonNode * json_node_init_string (JsonNode *node,
+ const char *value);
+JsonNode * json_node_init_null (JsonNode *node);
+
JsonNode * json_node_copy (JsonNode *node);
void json_node_free (JsonNode *node);
+
JsonNodeType json_node_get_node_type (JsonNode *node);
GType json_node_get_value_type (JsonNode *node);
void json_node_set_parent (JsonNode *node,
*
* Json minor version component (e.g. 2 if %JSON_VERSION is 1.2.3)
*/
-#define JSON_MINOR_VERSION (15)
+#define JSON_MINOR_VERSION (16)
/**
* JSON_MICRO_VERSION:
*
* Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3)
*/
-#define JSON_MICRO_VERSION (2)
+#define JSON_MICRO_VERSION (0)
/**
* JSON_VERSION
*
* Json version.
*/
-#define JSON_VERSION (0.15.2)
+#define JSON_VERSION (0.16.0)
/**
* JSON_VERSION_S:
* Json version, encoded as a string, useful for printing and
* concatenation.
*/
-#define JSON_VERSION_S "0.15.2"
+#define JSON_VERSION_S "0.16.0"
/**
* JSON_VERSION_HEX:
builder \
generator \
gvariant \
+ invalid \
node \
object \
parser \
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 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.
# custom rules for quiet builds
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build/autotools/Makefile.am.gtest \
- $(top_srcdir)/build/autotools/Makefile.am.silent
+DIST_COMMON = $(top_srcdir)/build/autotools/Makefile.am.gtest \
+ $(top_srcdir)/build/autotools/Makefile.am.silent \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/build/depcomp
noinst_PROGRAMS = $(am__EXEEXT_2)
subdir = json-glib/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 =
am__EXEEXT_2 = array$(EXEEXT) boxed$(EXEEXT) builder$(EXEEXT) \
- generator$(EXEEXT) gvariant$(EXEEXT) node$(EXEEXT) \
- object$(EXEEXT) parser$(EXEEXT) path$(EXEEXT) reader$(EXEEXT) \
- serialize-simple$(EXEEXT) serialize-complex$(EXEEXT) \
- serialize-full$(EXEEXT) $(am__EXEEXT_1)
+ generator$(EXEEXT) gvariant$(EXEEXT) invalid$(EXEEXT) \
+ node$(EXEEXT) object$(EXEEXT) parser$(EXEEXT) path$(EXEEXT) \
+ reader$(EXEEXT) serialize-simple$(EXEEXT) \
+ serialize-complex$(EXEEXT) serialize-full$(EXEEXT) \
+ $(am__EXEEXT_1)
PROGRAMS = $(noinst_PROGRAMS)
array_SOURCES = array.c
array_OBJECTS = array.$(OBJEXT)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
boxed_SOURCES = boxed.c
boxed_OBJECTS = boxed.$(OBJEXT)
boxed_LDADD = $(LDADD)
gvariant_LDADD = $(LDADD)
gvariant_DEPENDENCIES = ../libjson-glib-1.0.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
+invalid_SOURCES = invalid.c
+invalid_OBJECTS = invalid.$(OBJEXT)
+invalid_LDADD = $(LDADD)
+invalid_DEPENDENCIES = ../libjson-glib-1.0.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
node_SOURCES = node.c
node_OBJECTS = node.$(OBJEXT)
node_LDADD = $(LDADD)
serialize_simple_LDADD = $(LDADD)
serialize_simple_DEPENDENCIES = ../libjson-glib-1.0.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+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 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build/depcomp
am__depfiles_maybe = depfiles
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = array.c boxed.c builder.c generator.c gvariant.c node.c \
- object.c parser.c path.c reader.c serialize-complex.c \
- serialize-full.c serialize-simple.c
-DIST_SOURCES = array.c boxed.c builder.c generator.c gvariant.c node.c \
- object.c parser.c path.c reader.c serialize-complex.c \
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = array.c boxed.c builder.c generator.c gvariant.c invalid.c \
+ node.c object.c parser.c path.c reader.c serialize-complex.c \
serialize-full.c serialize-simple.c
+DIST_SOURCES = array.c boxed.c builder.c generator.c gvariant.c \
+ invalid.c node.c object.c parser.c path.c reader.c \
+ serialize-complex.c serialize-full.c serialize-simple.c
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+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
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
# initialize variables for unconditional += appending
EXTRA_DIST = stream-load.json
-TEST_PROGS = array boxed builder generator gvariant node object parser \
- path reader serialize-simple serialize-complex serialize-full \
- $(NULL)
+TEST_PROGS = array boxed builder generator gvariant invalid node \
+ object parser path reader serialize-simple serialize-complex \
+ serialize-full $(NULL)
QUIET_GEN = $(AM_V_GEN)
QUIET_LN = $(QUIET_LN_$(V))
QUIET_LN_ = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
gvariant$(EXEEXT): $(gvariant_OBJECTS) $(gvariant_DEPENDENCIES) $(EXTRA_gvariant_DEPENDENCIES)
@rm -f gvariant$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(gvariant_OBJECTS) $(gvariant_LDADD) $(LIBS)
+invalid$(EXEEXT): $(invalid_OBJECTS) $(invalid_DEPENDENCIES) $(EXTRA_invalid_DEPENDENCIES)
+ @rm -f invalid$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(invalid_OBJECTS) $(invalid_LDADD) $(LIBS)
node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) $(EXTRA_node_DEPENDENCIES)
@rm -f node$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/builder.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvariant.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/invalid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Po@am__quote@
clean-libtool:
-rm -rf .libs _libs
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+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
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+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
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
.MAKE: check-am install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
- clean-generic clean-libtool clean-noinstPROGRAMS ctags \
- distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
+ clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+ ctags ctags-am distclean distclean-compile 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 \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am
+ tags tags-am uninstall uninstall-am
### testing rules
GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
ignore_logdir=false ; \
fi ; \
+ if test -d "$(top_srcdir)/.git"; then \
+ export REVISION="`git describe`" ; \
+ else \
+ export REVISION="$(JSON_VERSION) $(JSON_RELEASE_STATUS)" ; \
+ fi ; \
+ export TIMESTAMP=`date +%Y-%m-%dT%H:%M:%S%z` ; \
for subdir in $(SUBDIRS) . ; do \
test "$$subdir" = "." -o "$$subdir" = "po" || \
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
done ; \
$$ignore_logdir || { \
- echo '<?xml version="1.0"?>' > $@.xml ; \
- echo '<report-collection>' >> $@.xml ; \
- echo '<info>' >> $@.xml ; \
- echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
- echo ' <version>$(VERSION)</version>' >> $@.xml ; \
- echo '</info>' >> $@.xml ; \
+ echo '<?xml version="1.0"?>' > $@.xml ; \
+ echo '<report-collection>' >> $@.xml ; \
+ echo '<info>' >> $@.xml ; \
+ echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
+ echo ' <version>$(JSON_VERSION)</version>' >> $@.xml ; \
+ echo " <revision>$$REVISION</revision>" >> $@.xml ; \
+ echo " <date>$$TIMESTAMP</date>" >> $@.xml ; \
+ echo '</info>' >> $@.xml ; \
for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
done ; \
node = json_array_get_element (array, 0);
g_assert_cmpint (JSON_NODE_TYPE (node), ==, JSON_NODE_NULL);
+ g_assert (json_array_get_null_element (array, 0));
+
+ json_array_add_int_element (array, 42);
+ g_assert_cmpint (json_array_get_length (array), ==, 2);
+ g_assert_cmpint (json_array_get_int_element (array, 1), ==, 42);
+
+ json_array_add_double_element (array, 3.14);
+ g_assert_cmpint (json_array_get_length (array), ==, 3);
+ g_assert_cmpfloat (json_array_get_double_element (array, 2), ==, 3.14);
+
+ json_array_add_boolean_element (array, TRUE);
+ g_assert_cmpint (json_array_get_length (array), ==, 4);
+ g_assert (json_array_get_boolean_element (array, 3));
+
+ json_array_add_string_element (array, "Hello");
+ g_assert_cmpint (json_array_get_length (array), ==, 5);
+ g_assert_cmpstr (json_array_get_string_element (array, 4), ==, "Hello");
+
+ json_array_add_string_element (array, NULL);
+ g_assert_cmpint (json_array_get_length (array), ==, 6);
+ g_assert (json_array_get_string_element (array, 5) == NULL);
+ g_assert (json_array_get_element (array, 5) != NULL);
+ g_assert (json_array_get_null_element (array, 5));
+
+ json_array_add_array_element (array, NULL);
+ g_assert (json_array_get_array_element (array, 6) == NULL);
+ g_assert (json_array_get_null_element (array, 6));
+
+ json_array_add_object_element (array, json_object_new ());
+ g_assert (json_array_get_object_element (array, 7) != NULL);
+
+ json_array_add_object_element (array, NULL);
+ g_assert (json_array_get_object_element (array, 8) == NULL);
+ g_assert (json_array_get_null_element (array, 8));
json_array_unref (array);
}
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
+
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/array/empty-array", test_empty_array);
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/boxed/serialize-property", test_serialize_boxed);
#include <json-glib/json-glib.h>
-static const gchar *complex_object = "{\"depth1\":[1,{\"depth2\":[3,[null],\"after array\"],\"value2\":true}],\"object1\":{}}";
+static const gchar *complex_object = "{\"depth1\":[1,{\"depth2\":[3,[null,false],\"after array\"],\"value2\":true}],\"object1\":{},\"value3\":null,\"value4\":42}";
static const gchar *empty_object = "{\"a\":{}}";
json_builder_begin_array (builder);
json_builder_add_null_value (builder);
+ json_builder_add_boolean_value (builder, FALSE);
json_builder_end_array (builder);
json_builder_add_string_value (builder, "after array");
json_builder_begin_object (builder);
json_builder_end_object (builder);
+ json_builder_set_member_name (builder, "value3");
+ json_builder_add_null_value (builder);
+
+ json_builder_set_member_name (builder, "value4");
+ json_builder_add_int_value (builder, 42);
+
json_builder_end_object (builder);
node = json_builder_get_root (builder);
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/builder/complex", test_builder_complex);
"}"
"}";
+static const char *pretty_examples[] = {
+ "[\n]",
+
+ "{\n}",
+
+ "[\n"
+ "\ttrue,\n"
+ "\tfalse,\n"
+ "\tnull,\n"
+ "\t\"hello\"\n"
+ "]",
+
+ "{\n"
+ "\t\"foo\" : 42,\n"
+ "\t\"bar\" : true,\n"
+ "\t\"baz\" : null\n"
+ "}",
+};
+
+static const int n_pretty_examples = G_N_ELEMENTS (pretty_examples);
+
static const struct {
const gchar *lang;
const gchar *sep;
json_node_take_array (root, json_array_new ());
json_generator_set_root (gen, root);
- g_object_set (gen, "pretty", FALSE, NULL);
+ g_object_set (gen, "pretty", FALSE, "indent", 0, "indent-char", ' ', NULL);
data = json_generator_to_data (gen, &len);
g_assert_cmpint (len, ==, strlen (empty_array));
g_assert_cmpstr (data, ==, empty_array);
+ g_assert (json_generator_get_pretty (gen) == FALSE);
+ g_assert_cmpint (json_generator_get_indent (gen), ==, 0);
+ g_assert_cmpint (json_generator_get_indent_char (gen), ==, ' ');
+
g_free (data);
json_node_free (root);
g_object_unref (gen);
json_node_free (node);
}
+static void
+test_pretty (void)
+{
+ JsonParser *parser = json_parser_new ();
+ JsonGenerator *generator = json_generator_new ();
+ int i;
+
+ json_generator_set_pretty (generator, TRUE);
+ json_generator_set_indent (generator, 1);
+ json_generator_set_indent_char (generator, '\t');
+
+ for (i = 0; i < n_pretty_examples; i++)
+ {
+ JsonNode *root;
+ char *data;
+ gsize len;
+
+ g_assert (json_parser_load_from_data (parser, pretty_examples[i], -1, NULL));
+
+ root = json_parser_get_root (parser);
+ g_assert (root != NULL);
+
+ json_generator_set_root (generator, root);
+
+ data = json_generator_to_data (generator, &len);
+
+ if (g_test_verbose ())
+ g_print ("** checking pretty printing:\n%s\n** expected:\n%s\n",
+ data,
+ pretty_examples[i]);
+
+ g_assert_cmpint (len, ==, strlen (pretty_examples[i]));
+ g_assert_cmpstr (data, ==, pretty_examples[i]);
+
+ g_free (data);
+ }
+
+ g_object_unref (generator);
+ g_object_unref (parser);
+}
+
int
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/generator/empty-array", test_empty_array);
g_test_add_func ("/generator/simple-object", test_simple_object);
g_test_add_func ("/generator/nested-object", test_nested_object);
g_test_add_func ("/generator/decimal-separator", test_decimal_separator);
+ g_test_add_func ("/generator/pretty", test_pretty);
return g_test_run ();
}
TestCase test_case;
gchar *test_name;
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
/* GVariant to JSON */
--- /dev/null
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <glib.h>
+
+#include <json-glib/json-glib.h>
+
+static void
+test_invalid_bareword (gconstpointer user_data)
+{
+ const char *json = user_data;
+ GError *error = NULL;
+ JsonParser *parser;
+ gboolean res;
+
+ parser = json_parser_new ();
+ g_assert (JSON_IS_PARSER (parser));
+
+ if (g_test_verbose ())
+ g_print ("invalid data: '%s'...", json);
+
+ res = json_parser_load_from_data (parser, json, -1, &error);
+
+ g_assert (!res);
+ g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_INVALID_BAREWORD);
+
+ if (g_test_verbose ())
+ g_print ("expected error: %s\n", error->message);
+
+ g_clear_error (&error);
+
+ g_object_unref (parser);
+}
+
+static void
+test_invalid_assignment (gconstpointer user_data)
+{
+ const char *json = user_data;
+ GError *error = NULL;
+ JsonParser *parser;
+ gboolean res;
+
+ parser = json_parser_new ();
+ g_assert (JSON_IS_PARSER (parser));
+
+ if (g_test_verbose ())
+ g_print ("invalid data: '%s'...", json);
+
+ res = json_parser_load_from_data (parser, json, -1, &error);
+
+ g_assert (!res);
+ g_assert (error != NULL);
+
+ if (g_test_verbose ())
+ g_print ("expected error: %s\n", error->message);
+
+ g_clear_error (&error);
+
+ g_object_unref (parser);
+}
+
+static void
+test_invalid_value (gconstpointer user_data)
+{
+ const char *json = user_data;
+ GError *error = NULL;
+ JsonParser *parser;
+ gboolean res;
+
+ parser = json_parser_new ();
+ g_assert (JSON_IS_PARSER (parser));
+
+ if (g_test_verbose ())
+ g_print ("invalid data: '%s'...", json);
+
+ res = json_parser_load_from_data (parser, json, -1, &error);
+
+ g_assert (!res);
+ g_assert (error != NULL);
+
+ if (g_test_verbose ())
+ g_print ("expected error: %s\n", error->message);
+
+ g_clear_error (&error);
+
+ g_object_unref (parser);
+}
+
+static void
+test_invalid_array (gconstpointer user_data)
+{
+ const char *json = user_data;
+ GError *error = NULL;
+ JsonParser *parser;
+ gboolean res;
+
+ parser = json_parser_new ();
+ g_assert (JSON_IS_PARSER (parser));
+
+ if (g_test_verbose ())
+ g_print ("invalid data: '%s'...", json);
+
+ res = json_parser_load_from_data (parser, json, -1, &error);
+
+ g_assert (!res);
+ g_assert (error != NULL);
+
+ if (g_test_verbose ())
+ g_print ("expected error: %s\n", error->message);
+
+ g_clear_error (&error);
+
+ g_object_unref (parser);
+}
+
+static void
+test_invalid_object (gconstpointer user_data)
+{
+ const char *json = user_data;
+ GError *error = NULL;
+ JsonParser *parser;
+ gboolean res;
+
+ parser = json_parser_new ();
+ g_assert (JSON_IS_PARSER (parser));
+
+ if (g_test_verbose ())
+ g_print ("invalid data: '%s'...", json);
+
+ res = json_parser_load_from_data (parser, json, -1, &error);
+
+ g_assert (!res);
+ g_assert (error != NULL);
+
+ if (g_test_verbose ())
+ g_print ("expected error: %s\n", error->message);
+
+ g_clear_error (&error);
+
+ g_object_unref (parser);
+}
+
+static void
+test_trailing_comma (gconstpointer user_data)
+{
+ const char *json = user_data;
+ GError *error = NULL;
+ JsonParser *parser;
+ gboolean res;
+
+ parser = json_parser_new ();
+ g_assert (JSON_IS_PARSER (parser));
+
+ if (g_test_verbose ())
+ g_print ("invalid data: '%s'...", json);
+
+ res = json_parser_load_from_data (parser, json, -1, &error);
+
+ g_assert (!res);
+ g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_TRAILING_COMMA);
+
+ if (g_test_verbose ())
+ g_print ("expected error: %s\n", error->message);
+
+ g_clear_error (&error);
+
+ g_object_unref (parser);
+}
+
+static const struct
+{
+ const char *path;
+ const char *json;
+ gpointer func;
+} test_invalid[] = {
+ /* bareword */
+ { "bareword-1", "rainbows", test_invalid_bareword },
+ { "bareword-2", "[ unicorns ]", test_invalid_bareword },
+ { "bareword-3", "{ \"foo\" : ponies }", test_invalid_bareword },
+ { "bareword-4", "[ 3, 2, 1, lift_off ]", test_invalid_bareword },
+ { "bareword-5", "{ foo : 42 }", test_invalid_bareword },
+
+ /* values */
+ { "values-1", "[ -false ]", test_invalid_value },
+
+ /* assignment */
+ { "assignment-1", "var foo", test_invalid_assignment },
+ { "assignment-2", "var foo = no", test_invalid_assignment },
+ { "assignment-3", "var = true", test_invalid_assignment },
+ { "assignment-4", "var blah = 42:", test_invalid_assignment },
+ { "assignment-5", "let foo = true;", test_invalid_assignment },
+
+ /* arrays */
+ { "array-1", "[ true, false", test_invalid_array },
+ { "array-2", "[ true }", test_invalid_array },
+ { "array-3", "[ \"foo\" : 42 ]", test_invalid_array },
+
+ /* objects */
+ { "object-1", "{ foo : 42 }", test_invalid_object },
+ { "object-2", "{ 42 : \"foo\" }", test_invalid_object },
+ { "object-3", "{ \"foo\", 42 }", test_invalid_object },
+ { "object-4", "{ \"foo\" : 42 ]", test_invalid_object },
+ { "object-5", "{ \"blah\" }", test_invalid_object },
+ { "object-6", "{ \"a\" : 0 \"b\" : 1 }", test_invalid_object },
+ { "object-7", "{ \"\" : false }", test_invalid_object },
+
+ /* trailing commas */
+ { "trailing-comma-1", "[ true, ]", test_trailing_comma },
+ { "trailing-comma-2", "{ \"foo\" : 42, }", test_trailing_comma },
+};
+
+static guint n_test_invalid = G_N_ELEMENTS (test_invalid);
+
+int
+main (int argc,
+ char *argv[])
+{
+ int i;
+
+#if !GLIB_CHECK_VERSION (2, 35, 1)
+ g_type_init ();
+#endif
+ g_test_init (&argc, &argv, NULL);
+
+ for (i = 0; i < n_test_invalid; i++)
+ {
+ char *test_path = g_strconcat ("/invalid/json/", test_invalid[i].path, NULL);
+
+ g_test_add_data_func_full (test_path,
+ (gpointer) test_invalid[i].json,
+ test_invalid[i].func,
+ NULL);
+
+ g_free (test_path);
+ }
+
+ return g_test_run ();
+}
}
static void
+test_get_int (void)
+{
+ JsonNode *node = json_node_new (JSON_NODE_VALUE);
+
+ json_node_set_int (node, 0);
+ g_assert_cmpint (json_node_get_int (node), ==, 0);
+ g_assert_cmpfloat (json_node_get_double (node), ==, 0.0);
+ g_assert (!json_node_get_boolean (node));
+ g_assert (!json_node_is_null (node));
+
+ json_node_set_int (node, 42);
+ g_assert_cmpint (json_node_get_int (node), ==, 42);
+ g_assert_cmpfloat (json_node_get_double (node), ==, 42.0);
+ g_assert (json_node_get_boolean (node));
+ g_assert (!json_node_is_null (node));
+
+ json_node_free (node);
+}
+
+static void
+test_get_double (void)
+{
+ JsonNode *node = json_node_new (JSON_NODE_VALUE);
+
+ json_node_set_double (node, 3.14);
+ g_assert_cmpfloat (json_node_get_double (node), ==, 3.14);
+ g_assert_cmpint (json_node_get_int (node), ==, 3);
+ g_assert (json_node_get_boolean (node));
+
+ json_node_free (node);
+}
+
+static void
test_gvalue (void)
{
JsonNode *node = json_node_new (JSON_NODE_VALUE);
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/nodes/init/int", test_init_int);
g_test_add_func ("/nodes/copy/null", test_copy_null);
g_test_add_func ("/nodes/copy/value", test_copy_value);
g_test_add_func ("/nodes/copy/object", test_copy_object);
+ g_test_add_func ("/nodes/get/int", test_get_int);
+ g_test_add_func ("/nodes/get/double", test_get_double);
g_test_add_func ("/nodes/gvalue", test_gvalue);
g_test_add_func ("/nodes/gvalue/autopromotion", test_gvalue_autopromotion);
json_object_set_string_member (object, "String", "Goodbye");
g_assert_cmpstr (json_object_get_string_member (object, "String"), ==, "Goodbye");
+ json_object_set_array_member (object, "Array", NULL);
+ g_assert_cmpint (JSON_NODE_TYPE (json_object_get_member (object, "Array")), ==, JSON_NODE_NULL);
+
+ json_object_set_object_member (object, "Object", NULL);
+ g_assert (json_object_get_null_member (object, "Object") == TRUE);
+
json_object_unref (object);
}
g_assert (json_object_has_member (object, "null"));
g_assert (json_object_get_string_member (object, "null") == NULL);
+ json_object_set_null_member (object, "array");
+ g_assert (json_object_get_array_member (object, "array") == NULL);
+
+ json_object_set_object_member (object, "object", NULL);
+ g_assert (json_object_get_member (object, "object") != NULL);
+ g_assert (json_object_get_object_member (object, "object") == NULL);
+
json_object_unref (object);
}
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/object/empty-object", test_empty_object);
}
static void
+verify_negative_int_value (JsonNode *node)
+{
+ g_assert_cmpint (-1, ==, json_node_get_int (node));
+}
+
+static void
verify_boolean_value (JsonNode *node)
{
g_assert_cmpint (TRUE, ==, json_node_get_boolean (node));
g_assert_cmpfloat (10.2e3, ==, json_node_get_double (node));
}
+static void
+verify_negative_double_value (JsonNode *node)
+{
+ g_assert_cmpfloat (-3.14, ==, json_node_get_double (node));
+}
+
static const struct {
const gchar *str;
JsonNodeType type;
{ "42", JSON_NODE_VALUE, G_TYPE_INT64, verify_int_value },
{ "true", JSON_NODE_VALUE, G_TYPE_BOOLEAN, verify_boolean_value },
{ "\"string\"", JSON_NODE_VALUE, G_TYPE_STRING, verify_string_value },
- { "10.2e3", JSON_NODE_VALUE, G_TYPE_DOUBLE, verify_double_value }
+ { "10.2e3", JSON_NODE_VALUE, G_TYPE_DOUBLE, verify_double_value },
+ { "-1", JSON_NODE_VALUE, G_TYPE_INT64, verify_negative_int_value },
+ { "-3.14", JSON_NODE_VALUE, G_TYPE_DOUBLE, verify_negative_double_value },
};
static const struct {
{ "{ \"test\" : \"foo \\u00e8\" }", "test", "foo è" }
};
-static const struct
-{
- const gchar *str;
- JsonParserError code;
-} test_invalid[] = {
- { "test", JSON_PARSER_ERROR_INVALID_BAREWORD },
- { "[ foo, ]", JSON_PARSER_ERROR_INVALID_BAREWORD },
- { "[ true, ]", JSON_PARSER_ERROR_TRAILING_COMMA },
- { "{ \"foo\" : true \"bar\" : false }", JSON_PARSER_ERROR_MISSING_COMMA },
- { "[ true, [ false, ] ]", JSON_PARSER_ERROR_TRAILING_COMMA },
- { "{ \"foo\" : { \"bar\" : false, } }", JSON_PARSER_ERROR_TRAILING_COMMA },
- { "[ { }, { }, { }, ]", JSON_PARSER_ERROR_TRAILING_COMMA },
- { "{ \"foo\" false }", JSON_PARSER_ERROR_MISSING_COLON }
-};
-
static guint n_test_base_values = G_N_ELEMENTS (test_base_values);
static guint n_test_simple_arrays = G_N_ELEMENTS (test_simple_arrays);
static guint n_test_nested_arrays = G_N_ELEMENTS (test_nested_arrays);
static guint n_test_nested_objects = G_N_ELEMENTS (test_nested_objects);
static guint n_test_assignments = G_N_ELEMENTS (test_assignments);
static guint n_test_unicode = G_N_ELEMENTS (test_unicode);
-static guint n_test_invalid = G_N_ELEMENTS (test_invalid);
static void
test_empty (void)
}
static void
-test_invalid_json (void)
-{
- JsonParser *parser;
- GError *error = NULL;
- gint i;
-
- parser = json_parser_new ();
- g_assert (JSON_IS_PARSER (parser));
-
- if (g_test_verbose ())
- g_print ("checking json_parser_load_from_data with invalid data...\n");
-
- for (i = 0; i < n_test_invalid; i++)
- {
- gboolean res;
-
- if (g_test_verbose ())
- g_print ("Parsing: '%s'\n", test_invalid[i].str);
-
- res = json_parser_load_from_data (parser, test_invalid[i].str, -1,
- &error);
-
- g_assert (!res);
- g_assert_error (error, JSON_PARSER_ERROR, test_invalid[i].code);
-
- if (g_test_verbose ())
- g_print ("Error: %s\n", error->message);
-
- g_clear_error (&error);
- }
-
- g_object_unref (parser);
-}
-
-static void
test_stream_sync (void)
{
JsonParser *parser;
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/parser/empty-string", test_empty);
g_test_add_func ("/parser/nested-object", test_nested_object);
g_test_add_func ("/parser/assignment", test_assignment);
g_test_add_func ("/parser/unicode-escape", test_unicode_escape);
- g_test_add_func ("/parser/invalid-json", test_invalid_json);
g_test_add_func ("/parser/stream-sync", test_stream_sync);
g_test_add_func ("/parser/stream-async", test_stream_async);
"}";
static const struct {
- const char *exp;
+ const char *desc;
+ const char *expr;
const char *res;
} test_expressions[] = {
{
+ "Title of the first book in the store, using objct notation.",
"$.store.book[0].title",
"[\"Sayings of the Century\"]"
},
{
+ "Title of the first book in the store, using array notation.",
"$['store']['book'][0]['title']",
"[\"Sayings of the Century\"]"
},
{
+ "All the authors from the every book.",
"$.store.book[*].author",
"[\"Nigel Rees\",\"Evelyn Waugh\",\"Herman Melville\",\"J. R. R. Tolkien\"]"
},
{
+ "All the authors.",
"$..author",
"[\"Nigel Rees\",\"Evelyn Waugh\",\"Herman Melville\",\"J. R. R. Tolkien\"]"
},
{
+ "Everything inside the store.",
"$.store.*",
NULL
},
{
+ "All the prices in the store.",
"$.store..price",
"[\"8.95\",\"12.99\",\"8.99\",\"22.99\",\"19.95\"]"
},
{
+ "The third book.",
"$..book[2]",
"[{\"category\":\"fiction\",\"author\":\"Herman Melville\",\"title\":\"Moby Dick\",\"isbn\":\"0-553-21311-3\",\"price\":\"8.99\"}]"
},
{
+ "The last book.",
"$..book[-1:]",
"[{\"category\":\"fiction\",\"author\":\"J. R. R. Tolkien\",\"title\":\"The Lord of the Rings\",\"isbn\":\"0-395-19395-8\",\"price\":\"22.99\"}]"
},
{
+ "The first two books.",
"$..book[0,1]",
"[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":\"8.95\"},{\"category\":\"fiction\",\"author\":\"Evelyn Waugh\",\"title\":\"Sword of Honour\",\"price\":\"12.99\"}]"
},
{
+ "The first two books, using a slice.",
"$..book[:2]",
"[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":\"8.95\"},{\"category\":\"fiction\",\"author\":\"Evelyn Waugh\",\"title\":\"Sword of Honour\",\"price\":\"12.99\"}]"
},
+ {
+ "All the books.",
+ "$['store']['book'][*]",
+ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":\"8.95\"},{\"category\":\"fiction\",\"author\":\"Evelyn Waugh\",\"title\":\"Sword of Honour\",\"price\":\"12.99\"},{\"category\":\"fiction\",\"author\":\"Herman Melville\",\"title\":\"Moby Dick\",\"isbn\":\"0-553-21311-3\",\"price\":\"8.99\"},{\"category\":\"fiction\",\"author\":\"J. R. R. Tolkien\",\"title\":\"The Lord of the Rings\",\"isbn\":\"0-395-19395-8\",\"price\":\"22.99\"}]"
+ },
+ {
+ "All the members of the bicycle object.",
+ "$.store.bicycle.*",
+ "[\"red\",\"19.95\"]"
+ },
};
static void
for (i = 0; i < G_N_ELEMENTS (test_expressions); i++)
{
- const char *expr = test_expressions[i].exp;
+ const char *expr = test_expressions[i].expr;
GError *error = NULL;
g_assert (json_path_compile (path, expr, &error));
for (i = 0; i < G_N_ELEMENTS (test_expressions); i++)
{
- const char *expr = test_expressions[i].exp;
+ const char *desc = test_expressions[i].desc;
+ const char *expr = test_expressions[i].expr;
const char *res = test_expressions[i].res;
JsonNode *matches;
char *str;
if (g_test_verbose ())
{
- g_print ("* expr[%02d]: '%s' =>\n"
+ g_print ("* expr[%02d]: %s ('%s') =>\n"
"- result: %s\n"
"- expected: %s\n",
- i, expr, str, res);
+ i, desc, expr, str, res);
}
g_assert_cmpstr (str, ==, res);
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=");
"[ 0, true, null, \"foo\", 3.14, [ false ], { \"bar\" : 42 } ]";
static const gchar *test_base_object_data =
-"{ \"text\" : \"hello, world!\", \"foo\" : \"bar\", \"blah\" : 47 }";
+"{ \"text\" : \"hello, world!\", \"foo\" : null, \"blah\" : 47, \"double\" : 42.47 }";
static const gchar *expected_member_name[] = {
"text",
"foo",
- "blah"
+ "blah",
+ "double",
};
static void
json_reader_set_root (reader, json_parser_get_root (parser));
g_assert (json_reader_is_object (reader));
- g_assert_cmpint (json_reader_count_members (reader), ==, 3);
+ g_assert_cmpint (json_reader_count_members (reader), ==, 4);
members = json_reader_list_members (reader);
g_assert (members != NULL);
g_strfreev (members);
- g_assert (json_reader_read_member (reader, "foo"));
+ g_assert (json_reader_read_member (reader, "text"));
g_assert (json_reader_is_value (reader));
- g_assert_cmpstr (json_reader_get_string_value (reader), ==, "bar");
+ g_assert_cmpstr (json_reader_get_string_value (reader), ==, "hello, world!");
+ json_reader_end_member (reader);
+
+ g_assert (json_reader_read_member (reader, "foo"));
+ g_assert (json_reader_get_null_value (reader));
json_reader_end_member (reader);
g_assert (!json_reader_read_member (reader, "bar"));
json_reader_end_element (reader);
g_assert (json_reader_get_error (reader) == NULL);
+ json_reader_read_member (reader, "double");
+ g_assert_cmpfloat (json_reader_get_double_value (reader), ==, 42.47);
+ json_reader_end_element (reader);
+
g_object_unref (reader);
g_object_unref (parser);
}
g_assert_cmpint (json_reader_get_int_value (reader), ==, 0);
json_reader_end_element (reader);
+ json_reader_read_element (reader, 1);
+ g_assert (json_reader_is_value (reader));
+ g_assert (json_reader_get_boolean_value (reader));
+ json_reader_end_element (reader);
+
json_reader_read_element (reader, 3);
g_assert (json_reader_is_value (reader));
g_assert_cmpstr (json_reader_get_string_value (reader), ==, "foo");
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=");
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/serialize/gobject-boxed", test_serialize);
#include <json-glib/json-gobject.h>
#define TEST_TYPE_ENUM (test_enum_get_type ())
+#define TEST_TYPE_FLAGS (test_flags_get_type ())
#define TEST_TYPE_BOXED (test_boxed_get_type ())
#define TEST_TYPE_OBJECT (test_object_get_type ())
#define TEST_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_OBJECT, TestObject))
TEST_ENUM_BAZ
} TestEnum;
+typedef enum {
+ TEST_FLAGS_NONE = 0,
+ TEST_FLAGS_FOO = 1 << 0,
+ TEST_FLAGS_BAR = 1 << 1,
+ TEST_FLAGS_BAZ = 1 << 2
+} TestFlags;
+
typedef struct _TestBoxed TestBoxed;
typedef struct _TestObject TestObject;
typedef struct _TestObjectClass TestObjectClass;
{
GObject parent_instance;
- gint foo;
- gboolean bar;
- gchar *baz;
- TestBoxed blah;
- TestEnum meh;
- gchar **mah;
+ gint m_int;
+ gboolean m_bool;
+ gchar *m_str;
+ TestBoxed m_boxed;
+ TestEnum m_enum;
+ gchar **m_strv;
+ TestFlags m_flags;
- TestObject *test;
+ TestObject *m_obj;
};
struct _TestObjectClass
return e_type;
}
+GType
+test_flags_get_type (void)
+{
+ static GType e_type = 0;
+
+ if (G_UNLIKELY (e_type == 0))
+ {
+ static const GFlagsValue values[] = {
+ { TEST_FLAGS_NONE, "TEST_FLAGS_NONE", "none" },
+ { TEST_FLAGS_FOO, "TEST_FLAGS_FOO", "foo" },
+ { TEST_FLAGS_BAR, "TEST_FLAGS_BAR", "bar" },
+ { TEST_FLAGS_BAZ, "TEST_FLAGS_BAZ", "baz" },
+ { 0, NULL, NULL }
+ };
+
+ e_type = g_flags_register_static ("TestFlags", values);
+ }
+
+ return e_type;
+}
+
enum
{
PROP_0,
PROP_BLAH,
PROP_MEH,
PROP_MAH,
+ PROP_FLAGS,
PROP_TEST
};
static void
test_object_finalize (GObject *gobject)
{
- g_free (TEST_OBJECT (gobject)->baz);
- g_strfreev (TEST_OBJECT (gobject)->mah);
+ g_free (TEST_OBJECT (gobject)->m_str);
+ g_strfreev (TEST_OBJECT (gobject)->m_strv);
- if (TEST_OBJECT (gobject)->test != NULL)
- g_object_unref (TEST_OBJECT (gobject)->test);
+ if (TEST_OBJECT (gobject)->m_obj != NULL)
+ g_object_unref (TEST_OBJECT (gobject)->m_obj);
G_OBJECT_CLASS (test_object_parent_class)->finalize (gobject);
}
switch (prop_id)
{
case PROP_FOO:
- TEST_OBJECT (gobject)->foo = g_value_get_int (value);
+ TEST_OBJECT (gobject)->m_int = g_value_get_int (value);
break;
case PROP_BAR:
- TEST_OBJECT (gobject)->bar = g_value_get_boolean (value);
+ TEST_OBJECT (gobject)->m_bool = g_value_get_boolean (value);
break;
case PROP_BAZ:
- g_free (TEST_OBJECT (gobject)->baz);
- TEST_OBJECT (gobject)->baz = g_value_dup_string (value);
+ g_free (TEST_OBJECT (gobject)->m_str);
+ TEST_OBJECT (gobject)->m_str = g_value_dup_string (value);
break;
case PROP_MEH:
- TEST_OBJECT (gobject)->meh = g_value_get_enum (value);
+ TEST_OBJECT (gobject)->m_enum = g_value_get_enum (value);
break;
case PROP_MAH:
- TEST_OBJECT (gobject)->mah = g_strdupv (g_value_get_boxed (value));
+ g_strfreev (TEST_OBJECT (gobject)->m_strv);
+ TEST_OBJECT (gobject)->m_strv = g_strdupv (g_value_get_boxed (value));
+ break;
+
+ case PROP_FLAGS:
+ TEST_OBJECT (gobject)->m_flags = g_value_get_flags (value);
break;
case PROP_TEST:
- TEST_OBJECT (gobject)->test = g_value_dup_object (value);
+ g_clear_object (&(TEST_OBJECT (gobject)->m_obj));
+ TEST_OBJECT (gobject)->m_obj = g_value_dup_object (value);
break;
default:
switch (prop_id)
{
case PROP_FOO:
- g_value_set_int (value, TEST_OBJECT (gobject)->foo);
+ g_value_set_int (value, TEST_OBJECT (gobject)->m_int);
break;
case PROP_BAR:
- g_value_set_boolean (value, TEST_OBJECT (gobject)->bar);
+ g_value_set_boolean (value, TEST_OBJECT (gobject)->m_bool);
break;
case PROP_BAZ:
- g_value_set_string (value, TEST_OBJECT (gobject)->baz);
+ g_value_set_string (value, TEST_OBJECT (gobject)->m_str);
break;
case PROP_BLAH:
- g_value_set_boxed (value, &(TEST_OBJECT (gobject)->blah));
+ g_value_set_boxed (value, &(TEST_OBJECT (gobject)->m_boxed));
break;
case PROP_MEH:
- g_value_set_enum (value, TEST_OBJECT (gobject)->meh);
+ g_value_set_enum (value, TEST_OBJECT (gobject)->m_enum);
break;
case PROP_MAH:
- g_value_set_boxed (value, TEST_OBJECT (gobject)->mah);
+ g_value_set_boxed (value, TEST_OBJECT (gobject)->m_strv);
+ break;
+
+ case PROP_FLAGS:
+ g_value_set_flags (value, TEST_OBJECT (gobject)->m_flags);
break;
case PROP_TEST:
- g_value_set_object (value, TEST_OBJECT (gobject)->test);
+ g_value_set_object (value, TEST_OBJECT (gobject)->m_obj);
break;
default:
G_TYPE_STRV,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
+ PROP_FLAGS,
+ g_param_spec_flags ("flags", "Flags", "Flags",
+ TEST_TYPE_FLAGS,
+ TEST_FLAGS_NONE,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT));
+ g_object_class_install_property (gobject_class,
PROP_TEST,
g_param_spec_object ("test", "Test", "Test",
TEST_TYPE_OBJECT,
static void
test_object_init (TestObject *object)
{
- object->foo = 0;
- object->bar = FALSE;
- object->baz = NULL;
+ object->m_int = 0;
+ object->m_bool = FALSE;
+ object->m_str = NULL;
+
+ object->m_boxed.foo = object->m_int;
+ object->m_boxed.bar = object->m_bool;
- object->blah.foo = object->foo;
- object->blah.bar = object->bar;
+ object->m_enum = TEST_ENUM_BAR;
- object->meh = TEST_ENUM_BAR;
+ object->m_strv = NULL;
- object->mah = NULL;
+ object->m_flags = TEST_FLAGS_NONE;
- object->test = NULL;
+ object->m_obj = NULL;
}
static const gchar *var_test =
" \"meh\" : \"baz\",\n"
" \"mah\" : [ \"hello\", \", \", \"world\", \"!\" ],\n"
" \"test\" : {\n"
-" \"bar\" : true,\n"
-" \"baz\" : \"world\",\n"
-" \"meh\" : \"foo\"\n"
+" \"bar\" : true,\n"
+" \"baz\" : \"world\",\n"
+" \"meh\" : 0,\n"
+" \"flags\" : \"foo|bar\""
" }\n"
"}";
" bar: %s\n"
" baz: %s\n"
" meh: %s\n",
- TEST_OBJECT (object)->foo == 42 ? "<true>" : "<false>",
- TEST_OBJECT (object)->bar == TRUE ? "<true>" : "<false>",
- TEST_OBJECT (object)->baz != NULL ? "<true>" : "<false>",
- TEST_OBJECT (object)->meh == TEST_ENUM_BAZ ? "<true>" : "<false>");
+ TEST_OBJECT (object)->m_int == 42 ? "<true>" : "<false>",
+ TEST_OBJECT (object)->m_bool == TRUE ? "<true>" : "<false>",
+ TEST_OBJECT (object)->m_str != NULL ? "<true>" : "<false>",
+ TEST_OBJECT (object)->m_enum == TEST_ENUM_BAZ ? "<true>" : "<false>");
- g_assert_cmpint (TEST_OBJECT (object)->foo, ==, 42);
- g_assert (TEST_OBJECT (object)->bar);
- g_assert_cmpstr (TEST_OBJECT (object)->baz, ==, "hello");
- g_assert_cmpint (TEST_OBJECT (object)->meh, ==, TEST_ENUM_BAZ);
+ g_assert_cmpint (TEST_OBJECT (object)->m_int, ==, 42);
+ g_assert (TEST_OBJECT (object)->m_bool);
+ g_assert_cmpstr (TEST_OBJECT (object)->m_str, ==, "hello");
+ g_assert_cmpint (TEST_OBJECT (object)->m_enum, ==, TEST_ENUM_BAZ);
- g_assert (TEST_OBJECT (object)->mah != NULL);
- g_assert_cmpint (g_strv_length (TEST_OBJECT (object)->mah), ==, 4);
+ g_assert (TEST_OBJECT (object)->m_strv != NULL);
+ g_assert_cmpint (g_strv_length (TEST_OBJECT (object)->m_strv), ==, 4);
- str = g_strjoinv (NULL, TEST_OBJECT (object)->mah);
+ str = g_strjoinv (NULL, TEST_OBJECT (object)->m_strv);
g_assert_cmpstr (str, ==, "hello, world!");
g_free (str);
- g_assert (TEST_IS_OBJECT (TEST_OBJECT (object)->test));
- test = TEST_OBJECT (TEST_OBJECT (object)->test);
- g_assert (test->bar);
- g_assert_cmpstr (test->baz, ==, "world");
- g_assert_cmpint (test->meh, ==, TEST_ENUM_FOO);
+ g_assert (TEST_IS_OBJECT (TEST_OBJECT (object)->m_obj));
+ test = TEST_OBJECT (TEST_OBJECT (object)->m_obj);
+ g_assert (test->m_bool);
+ g_assert_cmpstr (test->m_str, ==, "world");
+ g_assert_cmpint (test->m_enum, ==, TEST_ENUM_FOO);
+ g_assert_cmpint (test->m_flags, ==, TEST_FLAGS_FOO | TEST_FLAGS_BAR);
g_object_unref (object);
}
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/deserialize/json-to-gobject", test_deserialize);
main (int argc,
char *argv[])
{
+#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
+#endif
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/serialize/gobject", test_serialize);
--- /dev/null
+# Assamese translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+#
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2012.
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-26 15:38+0530\n"
+"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
+"Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
+"Language: as\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "এটা JSON আশা কৰা হৈছে, কিন্তু ৰুট ন'ডৰ ধৰণ '%s'"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON অৱস্থাত অপ্ৰত্যাশিত ধৰণ '%s'"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "এটা টিউপুলৰ সৈতে সংগত হবলে JSON এৰেত কিছুমান উপাদান সন্ধানহিন"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant টিউপুল ধৰণত বন্ধৰ চিহ্ন ')' সন্ধানহিন"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON এৰেত অপ্ৰত্যাশিত অতিৰিক্ত উপাদান"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant লে পৰিবৰ্তন কৰোতে অবৈধ স্ট্ৰিং মান"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"এটা GVariant অভিধান প্ৰবিষ্টিয়ে কেৱল এটা সদস্যৰ সৈতে এটা JSON অবজেক্ট আশা কৰে"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant শ্ৰেণী '%c' সমৰ্থিত নহয়"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "অবৈধ GVariant স্বাক্ষৰ"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON তথ্য ৰিক্ত"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: বিশ্লেষণ ত্ৰুটি: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath অভিব্যক্তিত কেৱল এটা ৰুট ন'ডৰ অনুমতি আছে"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "ৰুট ন'ড অবৈধ আখৰ '%c' দ্বাৰা অনুকৰণ কৰা হৈছে"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "স্খলিত স্লাইচ অভিব্যক্তি '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "অবৈধ সংহতি বিৱৰণ '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "অবৈধ স্লাইচ বিৱৰণ '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "অভৈধ এৰে সূচী বিৱৰণ '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "বৰ্তমান ন'ডৰ ধৰণ '%s', কিন্তু এটা এৰে অথবা এটা অবজেক্ট আশা কৰা হৈছিল।"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "সূচী '%d' বৰ্তমান অৱস্থানত এৰেৰ আকাৰতকে অধিক।"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "সূচী '%d' বৰ্তমান অৱস্থানত অবজেক্টৰ আকাৰতকে ডাঙৰ।"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "বৰ্তমান অৱস্থানত কোনো ন'ড উপলব্ধ নাই"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "বৰ্তমান অৱস্থানত এটা '%s' আছে কিন্তু এটা এৰে নাই"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "বৰ্তমান ন'ডৰ ধৰণ '%s', কিন্তু এটা অবজেক্ট আশা কৰা হৈছিল।"
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "সদস্য '%s' বৰ্তমান অৱস্থানৰ অবজেক্টত বিৱৰিত নহয়।"
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "বৰ্তমান অৱস্থানত এটা '%s' আছে কিন্তু এটা অবজেক্ট নাই"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "বৰ্তমান অৱস্থানত এটা '%s' আছে কিন্তু এটা মান নাই"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "বৰ্তমান অৱস্থানত এটা স্ট্ৰিং ধৰণ নাই"
+
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "বৰ্তমান অৱস্থানত এটা পূৰ্ণসংখ্যা ধৰণ নাই"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "বৰ্তমান অৱস্থানত এটা দশমিকযুক্ত ধৰণ নাই"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "বৰ্তমান অৱস্থানত এটা বুলিয়ান ধৰণ নাই"
--- /dev/null
+# Bulgarian translation for json-glib po-file
+# Copyright (C) 2012, 2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the json-glib package.
+# Ivaylo Valkov <ivaylo@e-valkov.org>, 2012.
+# Alexander Shopov <ash@kambanaria.org>, 2013.
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Очакваха се данни в JSON, но кореновият елемент е от вида „%s“"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Неочакван вид „%s“ във възел на JSON"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr ""
+"Липсват елементи в масив на JSON. Това пречи на използването му и като "
+"списък."
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Липсва затварящият символ „)“ в списъка на GVariant"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Неочаквани допълнителни елементи в масив на JSON"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Неправилно преобразуване от низ в GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Речникът на GVariant очаква данни в JSON само с един член"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Класът на GVariant „%c“ не се поддържа"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Грешен подпис за вида GVariant"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "Няма данни в JSON"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Грешка при анализиране: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Позволен е само един коренов възел в изрази от вида „JSONPath“"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Символът „%c“ след кореновия възел е грешен"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Неправилен израз за отрязък: „%*s“"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Неправилна дефиниция за множество „%*s“"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Неправилна дефиниция за отрязък: „%*s“"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Неправилна дефиниция за индекс на масив „%*s“"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Възелът е от вида „%s“. Очакваше се масив или обект."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Индексът „%d“ е по-голям от броя на елементите в масива."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Индексът „%d“ е по-голям от броя на елементите в обекта."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Липсва възел на тази позиция"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "На тази позиция трябва да има масив, а не „%s“"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Възелът е от вида „%s“. Очакваше се обект."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Членът „%s“ не е дефиниран на тази позиция в обекта."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "На тази позиция трябва да има обект, а не „%s“"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "На тази позиция трябва да има стойност, а не „%s“"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "На тази позиция няма низ"
--- /dev/null
+# Bengali (India) translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+#
+# Sayak Sarkar <sayak.bugsmith@gmail.com>, 2012.
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: bn_IN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "একটি JSON বস্তুর প্রত্যাশা করা হচ্ছে, কিন্তু রুট নোড টাইপ হল `%s'"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON নোডের মধ্যে অপ্রত্যাশিত টাইপ '%s'"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON অ্যারের মধ্যে অনুপস্থিত উপাদানের একটি tuple বর্নিত"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant tuple টাইপে শেষ চিহ্ন ')' অনুপস্থিত"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON অ্যারের মধ্যে অপ্রত্যাশিত অতিরিক্ত উপাদানসমূহ"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant এর রূপান্তরিকরণে স্ট্রিং-এর মান অবৈধ"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "একটি GVariant অভিধান এন্ট্রি এক সদস্যের সঙ্গে ঠিক একটি JSON বস্তুর আশা করে"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant ক্লাস '%c' সমর্থিত নয়"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "অবৈধ GVariant স্বাক্ষর"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON তথ্য খালি"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d: পার্স ত্রুটি: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "কেবলমাত্র একটি রুট নোড একটি JSONPath অভিব্যক্তিতে অনুমোদিত করা হয়"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "রুট নোড অবৈধ অক্ষর '%c' দ্বারা অনুসরিত"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "ত্রুটিপূর্ণ স্লাইস্ অভিব্যক্তি '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "অবৈধ সেট সংজ্ঞা '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "অবৈধ স্লাইস্ সংজ্ঞা '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "অবৈধ অ্যারের সূচক সংজ্ঞা '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "বর্তমান নোড '%s' ধরনের, কিন্তু একটি অ্যারে অথবা কোনো বস্তু প্রত্যাশিত ছিল।"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "সূচক '%d' বর্তমান অবস্থান এ অ্যারের মাপের চেয়ে বেশী।"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "সূচক '% d' বর্তমান অবস্থানে বস্তুর আকারের চেয়ে বৃহত্তর।"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "বর্তমান অবস্থানে কোন নোড উপলব্ধ নয়"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "বর্তমান অবস্থানে একটি অ্যারের জায়গায় '%s' উপস্থিত"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "বর্তমান নোড '%s' ধরনের, কিন্তু একটি বস্তু প্রত্যাশিত ছিল।"
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "'%s' সদস্য বর্তমান অবস্থানে অবজেক্টে সংজ্ঞায়িত করা নেই।"
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "বর্তমান অবস্থানে একটি বস্তুর জায়গায় '%s' উপস্থিত"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "বর্তমান অবস্থানে একটি মানের জায়গায় '%s' উপস্থিত"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "বর্তমান অবস্থানে কোন স্ট্রিং নেই"
--- /dev/null
+# Catalan translation for json-glib.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the json-glib package.
+# Gil Forcada <gilforcada@guifi.net>, 2012, 2013.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "S'esperava un objecte JSON, però el node arrel és del tipus «%s»"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "No s'esperava el tipus «%s» en un node de JSON"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Manquen elements en la matriu de JSON perquè siguin una tupla"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Manca el símbol de tancament «)» pel tipus de tupla de GVariant"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "No s'esperaven elements extra en la matriu de JSON"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "La cadena no es pot convertir a GVariant, la conversió no és vàlida"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Un diccionari de GVariant requereix un objecte de JSON amb un sol membre"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "La classe «%c» de GVariant no es pot utilitzar"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "La signatura de GVariant no és vàlida"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "No hi ha dades de JSON"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: error en l'anàlisi: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Només es pot utilitzar un node arrel en una expressió JSONPath"
+
+#: json-glib/json-path.c:384
+#, 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:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "L'expressió de tallat «%*s» no està ben formatada"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "La definició del conjunt «%*s» no és vàlida"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "La definició del tallat «%*s» no és vàlida"
+
+#: json-glib/json-path.c:615
+#, 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-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"El node actual és de tipus «%s», però s'esperava una matriu, o bé, un "
+"objecte."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "L'índex «%d» és més gran que la mida de la matriu a la posició actual."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "L'índex «%d» és més gran que la mida de l'objecte a la posició actual."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "No hi ha cap node disponible a la posició actual"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "A la posició actual hi ha un «%s» i no una matriu"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "El node actual és de tipus «%s», però s'esperava un objecte."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "El membre «%s» no està definit a l'objecte de la posició actual."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "A la posició actual hi ha un «%s» i no un objecte"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "A la posició actual hi ha un «%s» i no un valor"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "A la posició actual no hi ha una cadena"
--- /dev/null
+# Catalan translation for json-glib.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the json-glib package.
+# Gil Forcada <gilforcada@guifi.net>, 2012, 2013.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: ca@valencia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "S'esperava un objecte JSON, però el node arrel és del tipus «%s»"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "No s'esperava el tipus «%s» en un node de JSON"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Manquen elements en la matriu de JSON perquè siguen una tupla"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Manca el símbol de tancament «)» pel tipus de tupla de GVariant"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "No s'esperaven elements extra en la matriu de JSON"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "La cadena no es pot convertir a GVariant, la conversió no és vàlida"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Un diccionari de GVariant requereix un objecte de JSON amb un sol membre"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "La classe «%c» de GVariant no es pot utilitzar"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "La signatura de GVariant no és vàlida"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "No hi ha dades de JSON"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: error en l'anàlisi: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Només es pot utilitzar un node arrel en una expressió JSONPath"
+
+#: json-glib/json-path.c:384
+#, 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:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "L'expressió de tallat «%*s» no està ben formatada"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "La definició del conjunt «%*s» no és vàlida"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "La definició del tallat «%*s» no és vàlida"
+
+#: json-glib/json-path.c:615
+#, 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-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"El node actual és de tipus «%s», però s'esperava una matriu, o bé, un "
+"objecte."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "L'índex «%d» és més gran que la mida de la matriu a la posició actual."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "L'índex «%d» és més gran que la mida de l'objecte a la posició actual."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "No hi ha cap node disponible a la posició actual"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "A la posició actual hi ha un «%s» i no una matriu"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "El node actual és de tipus «%s», però s'esperava un objecte."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "El membre «%s» no està definit a l'objecte de la posició actual."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "A la posició actual hi ha un «%s» i no un objecte"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "A la posició actual hi ha un «%s» i no un valor"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "A la posició actual no hi ha una cadena"
# Czech translation for json-glib.
# Copyright (C) 2011 json-glib's COPYRIGHT HOLDER
# This file is distributed under the same license as the json-glib package.
-# Marek Černocký <marek@manet.cz>, 2011.
+#
+# Marek Černocký <marek@manet.cz>, 2011, 2012.
#
msgid ""
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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2011-11-22 10:29+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-28 11:13+0100\n"
"Last-Translator: Marek Černocký <marek@manet.cz>\n"
"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
"Language: cs\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Očekává se objekt JSON, ale kořenový uzel je typu „%s“"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Neočekávaný typ „%s“ v uzlu JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Schází prvky v poli JSON, aby to byla n-tice"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Schází uzavírací symbol „)“ v typu n-tice GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Neočekávané dodatečné prvky v poli JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Neplatná hodnota typu řetězec převáděná na GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr "Záznam slovníku GVariant očekává objekt JSON s právě jedním členem"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Třída GVariant „%c“ není podporována"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Neplatná signatura GVariant"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Data JSON jsou prázdná"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: Chyba zpracování: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Chyba zpracování: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
#: json-glib/json-path.c:490
#, c-format
msgid "Malformed slice expression '%*s'"
-msgstr "Chybný výraz řezu „%*s“"
+msgstr "Chybný výraz dílu „%*s“"
#: json-glib/json-path.c:534
#, c-format
#: json-glib/json-path.c:587
#, c-format
msgid "Invalid slice definition '%*s'"
-msgstr "Neplatná definice řezu „%*s“"
+msgstr "Neplatná definice dílu „%*s“"
#: json-glib/json-path.c:615
#, c-format
msgid "Invalid array index definition '%*s'"
msgstr "Neplatná definice indexu pole „%*s“"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "Aktuální uzel je typu „%s“, ale bylo očekáváno pole nebo objekt."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "Index „%d“ je větší než velikost pole na aktuální pozici."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "Index „%d“ je větší než velikost objektu na aktuální pozici."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Na aktuální pozici není k dispozici žádný uzel"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "Aktuální pozice obsahuje „%s“ a ne pole"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Aktuální uzel je typu „%s“, ale byl očekáván objekt."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Člen „%s“ není na aktuálním pozici v objektu definován."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Aktuální pozice obsahuje „%s“ a ne objekt"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Aktuální pozice obsahuje „%s“ a ne hodnotu"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Aktuální pozice neobsahuje typ integer (celé číslo)"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Aktuální pozice neobsahuje typ float point (desetinné číslo)"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Aktuální pozice neobsahuje typ string (řetězec)"
-
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Aktuální pozice neobsahuje typ boolean (pravdivostní hodnota)"
--- /dev/null
+# Danish translation for json-glib.
+# Copyright (C) 2012-2013 json-glib's developers
+# This file is distributed under the same license as the json-glib package.
+#
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2012-2013.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-03-16 16:26+0100\n"
+"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Forventer et JSON-objekt, men rodknuden er af typen \"%s\""
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Uventet type \"%s\" i JSON-tilstand"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Manglende elementer i JSON-array for at kunne være en tuple"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Manglende lukkesymbol \")\" i GVariant-tupletype"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Uventet ekstra elementer i JSON-array"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Ugyldig strengværdi ved konvertering til GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "En GVariant-ordbogspost forventer et JSON-objekt med nøjagtigt ét tal"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant-klassen \"%c\" understøttes ikke"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Ugyldig GVariant-underskrift"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON-data er tom"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Fortolkningsfejl: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Kun en rodknude tillades i et JSONPath-udtryk"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Rodknuden efterfølges af et ugyldigt tegn, \"%c\""
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Misdannet slice-udtryk \"%*s\""
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Ugyldig mængdedefinition \"%*s\""
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Ugyldig slice-definition \"%*s\""
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Ugyldig arrayindeksdefinition \"%*s\""
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"Den nuværende knude er af typen \"%s\", men der blev forventet et array "
+"eller et objekt."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"Indekset \"%d\" er større end størrelsen af arrayet ved nuværende position."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"Indekset \"%d\" er større end størrelsen af objektet på den nuværende "
+"position."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Ingen tilgængelig knude på nuværende position"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Den nuværende position holder en \"%s\" og ikke et array"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr ""
+"Den nuværende knude er af typen \"%s\", men der blev forventet et objekt."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr ""
+"Medlemmet \"%s\" er ikke defineret i objektet på den nuværende position."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Den nuværende position indeholder en \"%s\" og ikke et objekt"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Den nuværende position indeholder en \"%s\" og ikke en værdi"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Den nuværende position indeholder ikke en strengtype"
# Copyright (C) 2011 json-glib's COPYRIGHT HOLDER
# This file is distributed under the same license as the json-glib package.
# Mario Blättermann <mario.blaettermann@gmail.com>, 2011.
+# Wolfgang Stöggl <c72578@yahoo.de>, 2012.
#
msgid ""
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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2011-11-13 16:49+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Language-Team: German <gnome-de@gnome.org>\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-26 08:19+0200\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
+"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Ein JSON-Objekt wurde erwartet, aber der Root-Knoten hat den Typ »%s«"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Unerwarteter Typ »%s« im JSON-Knoten"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Elemente im JSON-Array fehlen, um konform zu einem Tupel zu sein"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Schließende Klammer »)« im Typ des GVariant-Tupels fehlt"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Unerwartete zusätzliche Elemente im JSON-Array"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Ungültiger Zeichenkettenwert zur GVariant-Umwandlung"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Ein GVariant-Verzeichniseintrag erwartet ein JSON-Objekt mit genau einem "
"Mitglied"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "GVariant-Klasse »%c« wird nicht unterstützt"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Ungültige GVariant-Signatur"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "JSON-Daten sind leer"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: Verarbeitungsfehler: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Verarbeitungsfehler: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
#: json-glib/json-path.c:615
#, c-format
msgid "Invalid array index definition '%*s'"
-msgstr "Ungültige Array-Inex-Definition »%*s«"
+msgstr "Ungültige Array-Index-Definition »%*s«"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
"Der Typ des aktuellen Knotens ist »%s«, aber ein Array oder Objekt wurde "
"erwartet."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr ""
"Der Index »%d« übersteigt die Größe des Arrays an der aktuellen Position."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
msgstr ""
"Der Index »%d« übersteigt die Größe des Objekts an der aktuellen Position."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "An der aktuellen Position ist kein Knoten verfügbar"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "An der aktuellen Position befindet sich ein »%s« und kein Array"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Der aktuelle Knoten hat den Typ »%s«, aber ein Objekt wurde erwartet."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr ""
"Das Mitglied »%s« ist im Objekt an der aktuellen Position nicht definiert."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "An der aktuellen Position befindet sich ein »%s« und kein Objekt"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr ""
"An der aktuellen Position befindet sich ein »%s«, welches kein Wert ist"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "An der aktuellen Position befindet sich kein Ganzzahl-Typ"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "An der aktuellen Position befindet sich kein Gleitkomma-Typ"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "An der aktuellen Position befindet sich kein Zeichenketten-Typ"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "An der aktuellen Position befindet sich kein boolescher Typ"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "An der aktuellen Position befindet sich kein Ganzzahl-Typ"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "An der aktuellen Position befindet sich kein Gleitkomma-Typ"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "An der aktuellen Position befindet sich kein boolescher Typ"
"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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2012-06-21 23:33+0300\n"
-"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-11-01 11:43+0200\n"
+"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
"Language-Team: team@gnome.gr\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"X-Generator: Virtaal 0.7.0\n"
"X-Project-Style: gnome\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
-msgstr ""
-"Αναμένεται αντικείμενο JSON, αλλά ο κόμβος υπερχρήστη είναι του τύπου `%s'"
+msgstr "Αναμένεται αντικείμενο JSON, αλλά ο αρχικός κόμβος είναι τύπου `%s'"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Αναπάντεχος τύπος '%s' σε κόμβο JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Λείπουν στοιχεία σε πίνακα JSON για συμφωνία με πλειάδα"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Λείπει το σύμβολο κλεισίματος ')' στον τύπο πλειάδας GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Αναπάντεχα πρόσθετα στοιχεία σε πίνακα JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Άκυρη τιμή συμβολοσειράς μετατροπής σε GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Μια καταχώριση λεξικού GVariant περιμένει ένα αντικείμενο JSON με ακριβώς "
"ένα μέλος"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Η κλάση GVariant '%c' δεν υποστηρίζεται"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Άκυρη υπογραφή GVariant"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Τα δεδομένα JSON είναι κενά"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: Σφάλμα ανάλυσης: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Σφάλμα ανάλυσης: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Άκυρος ορισμός δείκτη πίνακα '%*s'"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr ""
-"Ο τρέχον κόμβος είναι του τύπου '%s', αλλά ένας πίνακας ή ένα αντικείμενο "
-"αναμενότανε."
+"Ο τρέχον κόμβος είναι τύπου '%s', αλλά αναμενόταν ένας πίνακας ή ένα "
+"αντικείμενο."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
"Ο δείκτης '%d' είναι μεγαλύτερος από το μέγεθος του πίνακα στην τρέχουσα "
"θέση."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"Ο δείκτης '%d' είναι μεγαλύτερος από το μέγεθος του αντικειμένου στην "
"τρέχουσα θέση."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
-msgstr "ΧÏ\89Ï\81ίÏ\82 διαθÎÏ\83ιμο κÏ\8cμβο στην τρέχουσα θέση"
+msgstr "Î\9aανÎναÏ\82 διαθÎÏ\83ιμοÏ\82 κÏ\8cμβοÏ\82 στην τρέχουσα θέση"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι ένα πίνακα"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
-msgstr ""
-"Ο τρέχον κόμβος είναι του τύπου '%s', αλλά ένα αντικείμενο αναμενότανε."
+msgstr "Ο τρέχον κόμβος είναι του τύπου '%s', αλλά αναμενόταν ένα αντικείμενο."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Το μέλος '%s' δεν ορίζεται στο αντικείμενο στην τρέχουσα θέση."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι ένα αντικείμενο"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι μια τιμή"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Η τρέχουσα θέση δεν περιέχει ακέραιο τύπο"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Η τρέχουσα θέση δεν περιέχει τύπο κινητής υποδιαστολής"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Η τρέχουσα θέση δεν περιέχει τύπο συμβολοσειράς"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Η τρέχουσα θέση δεν περιέχει τύπο Μπουλ"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "Η τρέχουσα θέση δεν περιέχει ακέραιο τύπο"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "Η τρέχουσα θέση δεν περιέχει τύπο κινητής υποδιαστολής"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "Η τρέχουσα θέση δεν περιέχει τύπο boolean"
--- /dev/null
+# British English translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-09-04 16:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: British English <en_GB@li.org>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);;\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Expecting a JSON object, but the root node is of type `%s'"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Unexpected type '%s' in JSON node"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Missing elements in JSON array to conform to a tuple"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Missing closing symbol ')' in the GVariant tuple type"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Unexpected extra elements in JSON array"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Invalid string value converting to GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant class '%c' not supported"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Invalid GVariant signature"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON data is empty"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d: Parse error: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Only one root node is allowed in a JSONPath expression"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Root node followed by invalid character '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Malformed slice expression '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Invalid set definition '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Invalid slice definition '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Invalid array index definition '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"The current node is of type '%s', but an array or an object was expected."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"The index '%d' is greater than the size of the array at the current position."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "No node available at the current position"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "The current position holds a '%s' and not an array"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "The current node is of type '%s', but an object was expected."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "The member '%s' is not defined in the object at the current position."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "The current position holds a '%s' and not an object"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "The current position holds a '%s' and not a value"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "The current position does not hold a string type"
--- /dev/null
+# Esperanto translation for json-glib.
+# Copyright (C) 2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the json-glib package.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2013.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Gtranslator 2.91.5\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Atendis JSON-objekton sed la radika nodo havas la tipon \"%s\""
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Neatendita tipo \"%s\" en JSON-nodo"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Elementoj mankas en la JSON-tabelo por esti konforma al tupelo"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Fermanta signo ')' mankas en la GVariant-tupelo-tipo"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Neatenditaj pluaj elementoj en JSON-tabelo"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Nevalida signoĉena valoro por konverto al GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "GVariant-vortaro-enigo atendas JSON-objekton kun ekzakte unu membro"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant-klaso '%c' ne estas subtenata"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Nevalida GVariant-subskribo"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON-datumoj estas malplenaj"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Analiz-eraro: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Nur unu 'Root'-nodo estas permesata en JSONPath-esprimo"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Malantaŭ la radika nodo sekvas nevalida signo \"%c\""
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Nevalida segment-esprimo \"%*s\""
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Nevalida \"set\"-difino \"%*s\""
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Nevalida segment-difino \"%*s\""
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Nevalida tebel-indeks-difino \"%*s\""
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"La tipo de la nuna nodo estas \"%s\", sed tabelo aŭ objekto estis atendita."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"La indekso '%d' estas pli grande ol la grando de la tabelo ĉe la aktuala "
+"pozicio."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"La indekso '%d' estas pli grande ol la grando de la objekto ĉe la aktuala "
+"pozicio."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Neniu nodo estas ĉe la aktuala pozicio"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "La aktuala pozicio havas na '%s' kaj ne tabelon"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "La aktuala nodo havas la tipon '%s', sed objekto estis atendita."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "La membro '%s' ne estas definita en la objekto ĉe la aktuala pozicio."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "La aktuala pozicio havas na '%s' kaj ne objekton"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "La aktuala pozicio havas na '%s' kaj ne valoron"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "La aktuala pozicio ne havas signoĉenan tipon"
+
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "La aktuala pozicio ne havas entjeran tipon"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "La aktuala pozicio ne havas glitkoman tipon"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "La aktuala pozicio ne havas bulean tipon"
# Copyright (C) 2011 json-glib's COPYRIGHT HOLDER
# This file is distributed under the same license as the json-glib package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012.
#
msgid ""
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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2011-12-06 20:20+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-28 13:31+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Se esperaba un objeto JSON, pero el nodo raíz es de tipo «%s»"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Tipo «%s» no esperado en un nodo JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Faltan elementos en el vector JSON para conformar una tupla"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Falta el símbolo de cierre «)» en la tupla de GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Elementos adicionales no esperados en el vector JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Valor de cadena no válido al convertir a GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Una entrada del diccionario de GVariant espera un objeto JSON con sólo un "
"miembro"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Clase «%c» de GVariant no soportada"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Firma de GVariant no válida"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Datos de JSON vacíos"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: error al analizar: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Error al analizr: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Definición de índice de vector no válida «%*s»"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr ""
"El nodo actual es de tipo «%s», pero se esperaba un objeto o un vector."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr ""
"El índice «%d» es mayor que el tamaño del vector en la posición actual."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
msgstr ""
"El índice «%d» es mayor que el tamaño del objeto en la posición actual."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "No hay ningún nodo disponible en la posición actual"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "La posición actual tiene un «%s» y no un vector"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "El nodo actual es de tipo «%s», pero se esperaba un objeto."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "El miembro «%s» no está definido en el objeto en la posición actual."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "La posición actual tiene un «%s» y no un objeto"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "La posición actual tiene un «%s» y no un valor"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "La posición actual no tiene un tipo entero"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "La posición actual no tiene un tipo de coma flotante"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "La posición actual no tiene un tipo de cadena"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "La posición actual no tiene un tipo booleano"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "La posición actual no tiene un tipo entero"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "La posición actual no tiene un tipo de coma flotante"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "La posición actual no tiene un tipo booleano"
--- /dev/null
+# Estonian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Mattias Põldaru <mahfiaz@gmail.com>, 2012.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Oodati JSON objekti, kuid juursõlme liik on '%s'"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON sõlmes esines ootamatu liik '%s'"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON massiivis puuduvad tuple'i moodustamiseks vajalikud elemendid"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Puuduv sulgev ')' sümbol GVariant tuple'is"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Ootamatud lisaelemendid JSON massiivis"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Sobimatu sõne väärtus GVariandiks teisendamisel"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"GVariant dictionary kirje eeldab JSON objekti, milles on täpselt üks liige"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant klass '%c' pole toetatud"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Sobimatu GVariant-i allkiri"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON ei sisalda andmeid"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: parsimise viga: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Ainult juursõlm on lubatud JSONPath expression lauses"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Juursõlmele järgneb sobimatu märk '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Sobimatu tüki väljendus (slice expression) '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Sobimatu kogu (set) definitsioon '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Sobimatu tüki (slice) definitsioon '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Sobimatu massiivi indeksi definitsioon '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Praeguse sõlme liik on '%s', aga oodati massiivi või objekti."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Indeks '%d' on suurem kui massivi suurus praeguses asukohas."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Indeks '%d' on suurem kui objekti suurus praeguses asukohas."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Praeguses asukohas pole saadaval ühtegi sõlme"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Praegune asukoht sisaldab '%s' ning see pole massiiv"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Praeguse sõlme liik on '%s', aga oodati objekti."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Liige '%s' ei ole defineeritud praeguses asukohas asuvas objektis."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Praegune asukoht sisaldab '%s', mitte objekti"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Praegune asukoht sisaldab '%s' ning mitte väärtust"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Praegune asukoht ei sisalda sõne liiki"
--- /dev/null
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-03-03 20:43+0100\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "JSON objektu bat espero zen, baina erroaren nodoa '%s' motakoa da"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Ustekabeko '%s' mota JSON nodoan"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON matrizean elementuak falta dira tupla bat osatzeko"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Itxierako ')' ikurra falta da GVariant tupla motan"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Ustekabeko elementu gehigarriak JSON nodoan"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Baliogabeko kate-balioa GVariant-era bihurtzean"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"GVariant hiztegiaren sarrera batek JSON objektu bat espero du kide bakar "
+"batekin soilik"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "'%c' GVariant klasea ez dago onartuta"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Baliogabeko GVariant sinadura"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSONen datuak hutsik daude"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: analisi-errorea: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr ""
+"Soilik erroko nodo bakar bat dago baimenduta JSONPath adierazpen batean"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Erroko nodoaren ondoren baliogabeko '%c' karakterea dago"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Gaizki osatutako '%*s' adierazpen zatia"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "'%*s' multzoaren definizioa baliogabea"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Baliogabeko '%*s' definizio zatia"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Baliogabeko '%*s' matrizearen indizearen definizioa"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Uneko nodoa '%s' motakoa da, baina matrize edo objektu bat espero zen."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "'%d' indizea uneko posizioko matrizearen tamaina baino handiagoa da."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "'%d' indizea uneko posizioko objektuaren tamaina baino handiagoa da ."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Ez dago nodorik erabilgarri uneko posizioan"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Uneko posizioak '%s' dauka, eta ez matrize bat"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Uneko nodoa '%s' motakoa da, baina objektu bat espero zen."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "'%s' kidea ez dago uneko posizioko objektuan definituta."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Uneko posizioak '%s' dauka, baina ez objektu bat"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Uneko posizioak '%s' dauka, baina ez balio bat"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Uneko posizioak ez dauka kate motakorik"
--- /dev/null
+# French translation of jon-glib.
+# Copyright (C) 2012 json-glib COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Josselin TILLAY-DOLEDEC <josselin.td@gmail.com>, 2012.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-02-20 20:12+0100\n"
+"Last-Translator: Josselin TILLAY-DOLEDEC <josselin.td@gmail.com>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Objet de type JSON attendu mais le nœud racine est de type « %s »"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Type « %s » inattendu dans le nœud JSON"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Éléments manquants dans le tableau JSON pour être conforme à un tuple"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Symbole fermant « ) » manquant dans le tuple GVariant"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Éléments supplémentaires inattendus dans le tableau JSON"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Chaîne de caractères invalide pour la conversion en GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Une entrée de dictionnaire GVariant requiert un objet JSON contenant un seul "
+"membre"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Classe GVariant « %c » non prise en charge"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Signature GVariant non valide"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "Les données JSON sont vides"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Erreur d'analyse : %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Un seul nœud racine autorisé dans une expression JSONPath"
+
+#: json-glib/json-path.c:384
+#, 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:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Expression de tranche malformée « %*s »"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Définition d'ensemble invalide « %*s »"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Définition de tranche invalide « %*s »"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Définition d'indice de tableau invalide « %*s »"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"Le nœud courant est de type « %s » mais un tableau ou un objet était attendu."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"L'indice « %d » est plus grand que la taille du tableau à la position "
+"actuelle."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"L'indice « %d » est plus grand que la taille de l'objet indiqué à la "
+"position actuelle."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Aucun nœud disponible à cette position."
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr ""
+"La position actuelle contient un élément de type « %s » et non un tableau"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Le nœud actuel est de type « %s » mais un objet était attendu."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr ""
+"Le membre « %s » n'est pas défini dans l'objet à la position actuelle."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr ""
+"La position actuelle contient un élément de type « %s » et non un objet"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr ""
+"La position actuelle contient un élément de type « %s » et non une valeur"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "La position actuelle ne contient pas une chaîne de caractères"
+
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "La position actuelle n'indique pas un entier."
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "La position actuelle n'indique pas un pointeur flottant"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "La position actuelle n'indique pas un booléen."
# Galician translation for json-glib.
# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
# This file is distributed under the same license as the json-glib package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# Fran Dieguez <frandieguez@gnome.org>, 2012.
-#
msgid ""
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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2012-03-24 18:03+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-31 11:04+0200\n"
"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
+"Language-Team: gnome-l10n-gl@gnome.org\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Agardábase un obxecto JSON, pero o nodo raíz é de tipo «%s»"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Tipo «%s» non agardado nun nodo JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Faltan elementos no vector JSON para conformar unha tupla"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Falta o símbolo de peche «)» na tupla de GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Elementos adicionais non agardados no vector JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Valor de cadea non válido ao converter a GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Unha entrada do dicionario e GVariant agarda un obxecto JSON con só un membro"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Clase «%c» de GVariant non admitida"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Firma de GVariant non válida"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Datos de JSON baleiros"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: erro ao analizar: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: erro de análise: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Definición de índice de vector non válida «%*s»"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "O nodo actual é de tipo «%s», pero agardábase un obxecto ou un vector."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "O índice «%d» é maior que o tamaño do vector na posición actual."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "O índice «%d» é maior que o tamaño do obxecto na posición actual."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Non hai ningún nodo dipoñíbel na posición actual"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "A posición actual ten un «%s» e non un vector"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "O nodo actual é de tipo «%s», pero agardábase un obxecto."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "O membro «%s» non está definido no obxecto na posición actual."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "A posición actual ten un «%s» e non un obxecto"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "A posición actual ten un «%s» e non un valor"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "A posición actual non ten un tipo enteiro"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "A posición actual non ten un tipo de coma flotante"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "A posición actual non ten un tipo de cadea"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "A posición actual non ten un tipo booleano"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "A posición actual non ten un tipo enteiro"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "A posición actual non ten un tipo de coma flotante"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "A posición actual non ten un tipo booleano"
--- /dev/null
+# Hindi translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+#
+# chandankumar <chandankumar.093047@gmail.com>, 2012.
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "एक JSON वस्तु की उम्मीद है, लेकिन रूट नोड प्रकार `%s' हैं "
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "अनपेक्षित प्रकार '%s' JSON नोड में"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "एक टपल अनुरूप करने के लिए JSON सरणी में गुम तत्वों "
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr " GVariant टपल प्रकार में समापन प्रतीक ')' गुम"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON सरणी में अप्रत्याशित अतिरिक्त तत्वों"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant को करने के लिए परिवर्तित अवैध स्ट्रिंग मान "
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"GVariant शब्दकोश प्रविष्टि को वास्तव में एक सदस्य के साथ एक JSON वस्तु की उम्मीद है"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant वर्ग '%c' समर्थित नहीं है"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "अवैध GVariant हस्ताक्षर"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON डेटा खाली है"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d: व्याख्या त्रुटि: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "एक JSONPath अभिव्यक्ति में केवल एक रूट नोड की अनुमति दी है"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "अवैध अक्षर '%c' के बाद रूट नोड "
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "विकृत स्लाइस अभिव्यक्ति '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "अमान्य सेट परिभाषा '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "अवैध स्लाइस परिभाषा '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "अवैध सरणी सूचकांक परिभाषा '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "वर्तमान नोड प्रकार '%s' में से एक है, लेकिन एक सरणी या एक वस्तु की उम्मीद थी."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "सूचकांक '%d' वर्तमान स्थिति में सरणी के आकार की तुलना में अधिक है."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "सूचकांक '%d' वर्तमान स्थिति में वस्तु के आकार की तुलना में अधिक है."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "वर्तमान स्थिति में कोई नोड उपलब्ध नहीं "
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "मौजूदा स्थिति के पास '%s' हैं और सरणी नहीं है."
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "वर्तमान नोड प्रकार '%s' में से एक है, लेकिन एक वस्तु की उम्मीद थी."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "सदस्य '%s' वर्तमान स्थिति में वस्तु में परिभाषित नहीं है."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "वर्तमान स्थिति के लिए '%s' और कोई ऑब्जेक्ट आयोजित नहीं है"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "वर्तमान स्थिति के लिए '%s' और कोई मान आयोजित नहीं है"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "वर्तमान स्थिति के लिए स्ट्रिंग प्रकार नहीं है"
--- /dev/null
+# Hungarian translation of json-glib
+# Copyright (C) 2012. Free Software Foundation, Inc.
+# This file is distributed under the same license as the json-glib package.
+#
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2012.
+# Balázs Úr <urbalazs at gmail dot com>, 2012.
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-12-31 16:47+0100\n"
+"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
+"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "A várt JSON objektum helyett a gyökérobjektum „%s” típusú"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Váratlan „%s” típus a JSON csomópontban"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "A JSON tömbből hiányzó elemek miatt a tuple nem teljes"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Hiányzó „)” szimbólum a GVariant tuple típusban"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Váratlan extra elemek a JSON tömbben"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Érvénytelen karakterláncérték a GVariant-tá alakítás közben"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Egy GVariant szótárbejegyzés pontosan egy tagú JSON objektumot vár"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "A(z) „%c” GVariant osztály nem támogatott"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Érvénytelen GVariant aláírás"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "A JSON adatok üresek"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: feldolgozási hiba: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Csak egy gyökércsomópont engedélyezett a JSONPath kifejezésben"
+
+#: json-glib/json-path.c:384
+#, 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:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Hibás szeletkifejezés: „%*s”"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Érvénytelen halmazdefiníció: „%*s”"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Érvénytelen szeletdefiníció: „%*s”"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Érvénytelen tömbindex-definíció: „%*s”"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "A jelenlegi csomópont „%s” típusú a várt tömb vagy objektum helyett."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "A(z) „%d” index nagyobb az aktuális pozícióban lévő tömb méreténél."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"A(z) „%d” index nagyobb az aktuális pozícióban lévő objektum méreténél."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Nem érhető el csomópont az aktuális pozícióban"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Az aktuális pozícióban „%s” található tömb helyett"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "A jelenlegi csomópont „%s” típusú a várt objektum helyett."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr ""
+"A(z) „%s” tag nincs definiálva az aktuális pozícióban lévő objektumban."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Az aktuális pozícióban „%s” található objektum helyett"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Az aktuális pozícióban „%s” található érték helyett"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Az aktuális pozícióban nem karakterlánc típus található"
"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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2012-05-19 12:42+0700\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-27 07:26+0700\n"
"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
"Language-Team: Indonesian <gnome@i15n.org>\n"
"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: INDONESIA\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.4\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Mengharapkan objek JSON, tapi node akar bertipe '%s'"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Tipe '%s' yang tak diharapkan dalam node JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Kehilangan elemen dalam larik JSON untuk memenuhi syarat sebagai tuple"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Kehilangan simbol penutup ')' dalam tipe tuple GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Elemen ekstra yang tak diharapkan dalam larik JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Nilai string tak valid saat mengonversi ke GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Suatu entri kamus GVariant mengharapkan objek JSON dengan tepat satu anggota"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Kelas '%c' GVariant tak didukung"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Tanda tangan GVariant tak valid"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Data JSON kosong"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: Galat mengurai: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Galat mengurai: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Definisi indeks larik '%*s' tak valid"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "Node kini bertipe '%s', tapi larik atau objek yang diharapkan."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "Indeks '%d' lebih besar daripada ukuran larik pada posisi kini."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "Indeks '%d' lebih besar daripada ukuran objek pada posisi kini."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Node tak tersedia pada posisi kini"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "Posisi kini menampung '%s' dan bukan suatu larik"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Node kini bertipe '%s', tapi yang diharapkan adalah objek."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Anggota '%s' tak didefinisikan dalam objek pada posisi kini."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Posisi kini menampung '%s' dan bukan suatu objek"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Posisi kini menampung '%s' dan bukan suatu nilai"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Posisi kini tak menampung suatu tipe bilangan bulat"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Posisi kini tak menampung suatu tipe bilangan pecahan"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Posisi kini tak menampung suatu tipe string"
-
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Posisi kini tak menampung suatu tipe bool"
# Italian translation for json-glib.
-# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# Copyright (C) 2012, 2013 json-glib's copyright holder
# This file is distributed under the same license as the json-glib package.
# Luca Ferretti <lferrett@gnome.org>, 2012.
+# Milo Casagrande <milo@ubuntu.com>, 2013.
#
msgid ""
msgstr ""
-"Project-Id-Version: json-glib master\n"
+"Project-Id-Version: json-glib\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
"glib\n"
-"POT-Creation-Date: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2012-05-13 12:27+0200\n"
-"Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-01-24 22:35+0100\n"
+"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Atteso un oggetto JSON, ma il nodo radice è del tipo \"%s\""
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Tipo \"%s\" inatteso nel nodo JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Elementi mancanti nell'array JSON per conformità a una tupla"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Simbolo ')' di chiusra mancante nel tipo tupla GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Elementi aggiuntivi inattesi nell'array JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Valore di stringa non valido nella conversione a JSON"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Una voce di dizionario GVariant richiese un oggetto JSON con esattamente un "
"membro"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Classe GVariant '%c' non supportata"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Firma GVariant non valida"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "I dati JSON sono vuoti"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: errore di analisi: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: errore di analisi: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Definizione di indice array '%*s' non valida"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr ""
"Il tipo del nodo corrente è \"%s\", ma era atteso un array o un oggetto."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr ""
"L'indice '%d' è maggiore della dimensione dell'array alla posizione corrente."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"L'indice '%d' è maggiore della dimensione dell'oggetto alla posizione "
"corrente."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Nessun nodo disponibile alla posizione corrente"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "La posizione corrente contiene un \"%s\" e non un array"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Il tipo del nodo corrente è \"%s\", ma era atteso un oggetto."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Non è definito il membro \"%s\" nell'oggetto alla posizione corrente."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "La posizione corrente contiene un \"%s\" e non un oggetto"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "La posizione corrente contiene un \"%s\" e non un valore"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "La posizione corrente non contiene un tipo intero"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "La posizione corrente non contiene un tipo floating point"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "La posizione corrente non contiene un tipo stringa"
-
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "La posizione corrente non contiene un tipo bpplean"
--- /dev/null
+# json-glib ja.po
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2012.
+# Jiro Matsuzawa <jmatsuzawa@gnome.org>, 2012.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-08-06 19:56+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "JSON オブジェクトであるべきところ、ルートノードが `%s' 型です"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON ノードが `%s' 型になってしまってます"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON の配列にタプルを構成する要素が足りません"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant タプル型に閉じ記号 ')' がありません"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON 配列に余計な要素があります"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant に変換するのに無効な文字列です"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"GVariant の辞書エントリはメンバーを一つだけ含んだ JSON オブジェクトでなくては"
+"なりません"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant のクラス '%c' はサポートされていません"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "無効な GVariant シグネチャです"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON データが空です"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d: パースエラー: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath 式ではルートノード一つだけが許可されています"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "ルートノードの後に無効な文字 '%c' があります"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "不正なスライス式 '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "無効な集合定義 '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "無効なスライス定義: '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "無効な配列インデックス定義 '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"現在のノードは '%s' 型ですが、配列あるいはオブジェクトである必要があります。"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "インデックス '%d' は現在位置にある配列の長さよりも大きいです。"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "インデックス '%d' は現在位置のオブジェクトの大きさよりも大きいです。"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "現在位置にノードがありません"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "現在位置は '%s' で、配列ではありません"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "現在のノードは '%s' 型ですが、オブジェクトである必要があります。"
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "現在位置のオブジェクトで '%s' メンバーは定義されていません"
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "現在位置は '%s' で、オブジェクトではありません"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "現在位置は '%s' で値ではありません"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "現在位置が文字列型ではありません"
+
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "現在位置が整数型ではありません"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "現在位置が浮動小数点型ではありません"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "現在位置が論理値型ではありません"
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: json-glib 0.15.2\n"
+"Project-Id-Version: json-glib 0.16.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
"glib\n"
-"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\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"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr ""
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr ""
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr ""
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr ""
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr ""
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr ""
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr ""
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr ""
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr ""
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
+msgid "%s:%d:%d: Parse error: %s"
msgstr ""
#: json-glib/json-path.c:375
msgid "Invalid array index definition '%*s'"
msgstr ""
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr ""
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr ""
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr ""
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr ""
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr ""
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr ""
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr ""
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr ""
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr ""
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr ""
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr ""
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr ""
-
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr ""
--- /dev/null
+# Korean translation for json-glib.
+# Copyright (C) 2012 Seong-ho Cho et al.
+# This file is distributed under the same license as the json-glib package.
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2012, 2013.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-03-20 17:04+0900\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
+"Language-Team: Korean <gnome-kr@googlegroups.com>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.5\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "JSON 객체를 예상했지만 최상위 노드는 `%s' 형식을 지니고 있습니다"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON 노드에서 예상치 못한 '%s' 형식입니다"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "튜플에 따르기 위한 JSON 배열의 요소가 빠졌습니다"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant 튜플 형식에서 ')' 닫음 심볼이 빠졌습니다"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON 배열에 예기치 못한 추가 요소가 있습니다"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant로 변환하려는 문자열 값이 잘못되었습니다"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"GVariant 딕셔너리 항목은 정확히 하나의 요소를 가진 JSON 객체를 요구합니다"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant '%c' 클래스를 지원하지 않습니다"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "잘못된 GVariant 서명입니다"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON 데이터가 비었습니다"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: 해석 오류: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath 표현식에서는 단 하나만의 최상위 노드를 허용합니다"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "최상위 노드에 잘못된 '%c' 문자가 따라옵니다"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "잘못된 분배 표현식 '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "잘못된 셋 정의 '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "잘못된 분배 정의 '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "잘못된 배열 인덱스 정의 '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "현재 노드는 '%s' 형식을 지니고 있지만, 배열 또는 객체를 요구합니다."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "현재 위치의 '%d'번 인덱스는 배열의 크기보다 큽니다."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "현재 위치의 '%d'번 인덱스는 객체의 크기보다 큽니다."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "현재 위치에 노드가 없습니다"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "현재 위치에 '%s'이(가) 있으며, 배열이 아닙니다"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "현재 노드는 '%s' 형식을 지니고 있지만 객체를 요구합니다."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "현재 위치의 '%s' 구성원을 객체에 정의하지 않았습니다."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "현재 위치에 '%s'을(를) 지니고 있으며 객체가 아닙니다"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "현재 위치에 '%s'을(를) 지니고 있으며 값이 아닙니다"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "현재 위치에서 문자열 값을 지니고 있지 않습니다"
--- /dev/null
+# Kirghiz translation for json-glib.
+# Kyrgyz translation of json-glib
+# Copyright (C) 2012 json-glib authors
+# This file is distributed under the same license as the json-glib package.
+#
+# Timur Zhamakeev <ztimur@gmail.com>, 2012, 2013.
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: ky\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "JSON объекти күтүлүүдө, бирок башкы түйүн `%s' тибинде"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON түйүнүндө күтүлбөгөн тип: '%s' "
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON массивинде кортежге ылайык келүүчү элементтер жок"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant кортеж тибинде жабылуучу ')' тамгасы жок"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON массивинде күтүлбөгөн кошумча элементтер"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant тибине которуу үчүн берилген саптын мааниси туура эмес"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "GVariant сөздүк элементи, бир гана мүчөлүү JSON объекти болушу керек"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "'%c' GVariant классы колдоого ээ эмес"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "GVariant сигнатурасы туура эмес"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON маалыматы жок"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d: Ажыратып окуу катасы: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath туюнтмасында бир гана башкы түйүн болушу мүмкүн"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Башкы түйүн туура эмес тамга менен аяктаган: '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Туура эмес кесүү (slice) туюнтмасы '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Туура эмес ыйгаруу (set) аныктамасы '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Туура эмес кесүү (slice) аныктамасы '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Массив индексинин туура эмес аныктамасы '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Учурдагы түйүн '%s' тибинде; массив же объект күтүлгөн."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Учурдагы позициянын индекси:'%d' массивдин узундугунан чоң."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Учурдагы позициянын индекси:'%d'; объектин узундугунан чоң."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Учурдагы позицияда түйүн жок"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Учурдагы позицияда:'%s'; ал массив эмес"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Учурдагы түйүн '%s' тибинде; объект күтүлгөн."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Учурку позициядагы объекте '%s' аттуу мүчө аныкталган эмес."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Учурдагы позицияда:'%s'; ал объект эмес"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Учурдагы позицияда:'%s'; ал маани эмес"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Учурдагы позициянын тиби, саптык тип эмес"
--- /dev/null
+# Lithuanian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Aurimas Černius <aurisc4@gmail.com>, 2012.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-25 23:04+0300\n"
+"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
+"Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Tikimasi JSON objekto, bet šakninė viršūnė yra „%s“ tipo"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Netikėtas tipas „%s“ JSON viršūnėje"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Trūksta elementų JSON masyve junginiui sudaryti"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Trūksta uždarančio simbolio „)“ GVariant junginio tipe"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Netikėti papildomi elementai JSON masyve"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Netinkama eilutės reikšmė konvertavimui į GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "GVariant žodyno įrašas tikisi JSON objekto su vieninteliu nariu"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant klasė „%c“ nepalaikoma"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Netinkamas GVariant aprašas"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON duomenys yra tušti"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: skaitymo klaida: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath išraiškoje leidžiamas vienintelė šakninė viršūnė"
+
+#: json-glib/json-path.c:384
+#, 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:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Blogai suformuota dalinimo išraiška „%*s“"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Netinkamas aibės apibrėžimas „%*s“"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Netinkamas dalinimo apibrėžimas „%*s“"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Netinkamas masyvo apibrėžimas „%*s“"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Dabartinė viršūnė yra „%s“ tipo, bet tikėtasi masyvo arba objekto."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Indeksas „%d“ yra didesnis nei masyvo dydis dabartinėje pozicijoje."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Indeksas „%d“ yra didesnis nei objekto dydis dabartinėje pozicijoje."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Nėra viršūnės dabartinėje pozicijoje"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Dabartinėje pozicijoje yra „%s“, o ne masyvas"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Dabartinė viršūnė yra „%s“ tipo, bet tikėtasi objekto."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Narys „%s“ neapibrėžtas dabartinėje pozicijoje esančiame objekte."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Dabartinė pozicija turi „%s“, o ne objektą"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Dabartinė pozicija turi „%s“, o ne reikšmę"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Dabartinė pozicija turi „%s“, o ne eilutės tipą"
--- /dev/null
+# Latvian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+#
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013.
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-03-17 20:23+0200\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
+"Language: lv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Gaidīja JSON objektu, bet saknes mezglam ir tips “%s”"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Negaidīts tips “%s” JSON mezglā"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON masīvā trūkst elementu, lai tas atbilstu kortežam"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant korteža tipā trūkst aizverošā simbola “%s”"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON masīvā ir negaidīti papildu elementi"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Pārveidojot uz GVariant, nederīga virknes vērtība"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"GVariant vārdnīcas ieraksts gaidīja JSON objektu ar tieši vienu locekli"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant klase “%c” nav atbalstīta"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Nederīgs GVariant paraksts"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON dati ir tukši"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: parsēšanas kļūda — %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath izteiksmē ir atļauta tikai viens saknes mezgls"
+
+#: json-glib/json-path.c:384
+#, 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:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Slikti formēta gabala izteiksme “%*s”"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Nederīga kopas definīcija “%*s”"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Nederīga gabala definīcija “%*s”"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Nederīga masīva indeksa definīcija “%*s”"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Pašreizējam mezglam ir tips “%s”, bet tika gaidīts masīvs vai objekts."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Indekss “%d” dotajā pozīcijā ir lielāks kā masīva izmērs."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Indekss “%d” dotajā pozīcijā ir lielāks kā objekta izmērs."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Šajā pozīcija nav pieejams neviens mezgls"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Šajā pozīcijā ir “%s”, nevis masīvs"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Pašreizējam mezglam ir tips “%s”, bet tika gaidīts objekts."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Šajā pozīcijā objektā loceklis “%s” nav definēts."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Šajā pozīcijā ir “%s”, nevis objekts"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Šajā pozīcijā ir “%s”, nevis vērtība"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Šajā pozīcijā nav virknes tipa"
--- /dev/null
+# Malayalam translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Anish A <aneesh.nl@gmail.com>, 2012.
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: ml\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "`%s' അണ് റൂട്ട് നോഡിന്റെ തരം, പക്ഷേ JSON ഒബ്ജക്ട് ആണ് പ്രതീക്ഷിച്ചത്"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON node ല് '%s'എന്ന പ്രതീക്ഷിക്കാത്ത തരം"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "JSON അറേയില് ടപ്പിള് ആകാനായുള്ള കാര്യങ്ങള് കാണുന്നില്ല"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant ടപ്പിള് തരത്തില് തീരുന്ന ചിഹ്നം ')' കാണുന്നില്ല"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON അറേയില് വിചാരിക്കാത്ത അധികം കാര്യങ്ങള്"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant ലേക്ക് മാറ്റുന്ന അസാധുവായ വാചകം"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "ഒരേ ഒരു അംഗമുള്ള JSON ഒബ്ജക്റ്റിനെ GVariant നിഘണ്ടു എന്ട്രി പ്രതീക്ഷിക്കുന്നു"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "'%c' എന്ന GVariant തരം പിന്തുണയ്ക്കുന്നില്ല"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "അസാധുവായ GVariant ഒപ്പ്"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON ഡാറ്റ ശൂന്യം"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: പാഴ്സ് പിഴവ്: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath എക്സ്പ്രഷനില് ഒരു റൂട്ടേ അനുവദിനീയമായിട്ടുള്ളു"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "റൂട്ട് നോഡിന് ശേഷം തെറ്റായ അക്ഷരം '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "തെറ്റായ സ്ലൈസ് എക്സ്പ്രഷന് '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "'%*s' എന്നത് തെറ്റായ കൂട്ടം നിര്വചനമാണ്"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "'%*s' എന്നത് തെറ്റായ സ്ലൈസ് നിര്വചനമാണ്"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "'%*s' എന്നത് തെറ്റായ അറേ ഇന്റെക്സ് നിര്വചനമാണ്"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "ഇപ്പോഴത്തെ നോഡിന്റെ തരം '%s' ആണ്, പക്ഷേ ഒരു അറേയോ ഒബ്ജക്റ്റോ ആണ് പ്രതീക്ഷിച്ചത്."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "ഇപ്പോഴത്തെ സ്ഥാനത്തുള്ള അറേയുടെ വലിപ്പത്തെക്കാള് വലുതാണ് ഇന്ഡെക്സ് '%d'"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "ഇപ്പോഴത്തെ സ്ഥാനത്തുള്ള ഒബ്ജക്റ്റിന്റെ വലിപ്പത്തെക്കാള് വലുതാണ് ഇന്ഡെക്സ് '%d'"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "ഈ സ്ഥാനത്ത് ഒരു നോഡുമില്ല"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് '%s' ആണ് ഒരു അറേ അല്ല"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "ഇപ്പോഴത്തെ നോഡിന്റെ തരം '%s' ആണ്, പക്ഷേ ഒരു ഒബ്ജക്റ്റ് ആണ് പ്രതീക്ഷിച്ചത്."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "ഇപ്പോഴത്തെ സ്ഥാനത്തെ ഒബ്ജക്റ്റില് '%s' എന്ന അംഗം നിര്വ്വചിച്ചിട്ടില്ല."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് '%s' ആണ് ഒരു ഒബ്ജക്ട്ട് അല്ല"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് '%s' ആണ് ഒരു മൂല്യം അല്ല"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് ഒരു വാചകം അല്ല"
# Norwegian bokmål translation of json-glib.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2011.
+# Kjartan Maraas <kmaraas@gnome.org>, 2011-2013.
#
msgid ""
msgstr ""
"Project-Id-Version: json-glib 0.12.x\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
"glib\n"
-"POT-Creation-Date: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2011-12-19 09:45+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-01-23 14:01+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Kjartan Maraas <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
-msgstr ""
+msgstr "Forventet et JSON-objekt, men rotnoden er av type «%s»"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Uventet type «%s» i JSON-node"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr ""
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr ""
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
-msgstr ""
+msgstr "Uventede ekstra elementer i JSON-tabell"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
-msgstr ""
+msgstr "Ugyldig strengverdi ved konvertering til GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
-msgstr ""
+msgstr "GVariant-klasse «%c» er ikke støttet"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
-msgstr ""
+msgstr "Ugyldig signatur for GVariant"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "JSON-datastruktur er tom"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr ""
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Tolkefeil: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
-msgstr ""
+msgstr "Kun en rotnode tillates i et JSONPath-uttrykk"
#: json-glib/json-path.c:384
#, c-format
msgid "Root node followed by invalid character '%c'"
-msgstr ""
+msgstr "Rotnode etterfulgt av ugyldig tegn «%c»"
#: json-glib/json-path.c:490
#, c-format
#: json-glib/json-path.c:534
#, c-format
msgid "Invalid set definition '%*s'"
-msgstr ""
+msgstr "Ugyldig definisjon av sett «%*s»"
#: json-glib/json-path.c:587
#, c-format
msgid "Invalid array index definition '%*s'"
msgstr ""
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr ""
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr ""
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr ""
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
-msgstr ""
+msgstr "Ingen node tilgjengelig i denne posisjonen"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr ""
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr ""
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Medlem «%s» er ikke definert i objekt ved nåværende posisjon."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Nåværende posisjon innholder en «%s» og ikke et objekt"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Nåværende posisjon inneholder en «%s» og ikke en verdi"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Nåværende posisjon inneholder ikke en heltallstype"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Nåværende posisjon inneholder ikke en flyttallstype"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Nåværende posisjon inneholder ikke en streng-type"
-
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Nåværende posisjon inneholder ikke en boolsk type"
--- /dev/null
+# Oriya translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+#
+# Manoj Kumar Giri <mgiri@redhat.com>, 2012.
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: or\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "ଏକ JSON ବସ୍ତୁକୁ ଆଶାକରୁଅଛି, କିନ୍ତୁ ରୁଟର ନୋଡ `%s' ପ୍ରକାରର ଅଟେ"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON ନୋଡରେ ଆଶାକରାଯାଇନଥିବା ପ୍ରକାର '%s'"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "ଏକ tuple କୁ ନିଶ୍ଚିତ କରିବା ପାଇଁ JSON ଆରେରେ ଅନୁପସ୍ଥିତ ଉପାଦାନ"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant tuple ପ୍ରକାରରେ ବନ୍ଦ କରିବା ଚିହ୍ନ ')' ନାହିଁ"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON ଆରେର ଆଶାକରାଯାଇନଥିବା ଅତିରିକ୍ତ ଉପାଦାନ"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant କୁ ପରିବର୍ତ୍ତନ କରୁଥିବା ଅବୈଧ ବାକ୍ୟ ଖଣ୍ଡ ମୂଲ୍ୟ"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "ଏକ GVariant ଅଭିଧାନ ନିବେଶ ଗୋଟିଏ JSON ବସ୍ତୁକୁ ଗୋଟିଏ ସଦସ୍ୟ ସହିତ ଆଶାକରିଥାଏ"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant ଶ୍ରେଣୀ '%c' ସମର୍ଥିତ ନୁହଁ"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "ଅବୈଧ GVariant ହସ୍ତାକ୍ଷର"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON ତଥ୍ୟ ନାହିଁ"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d: ବିଶ୍ଳେଷଣ ତ୍ରୁଟି: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "କେବଳ ଗୋଟିଏ ମୂଖ୍ୟ ଚାଳକ ନୋଡ JSONPath ଅଭିବ୍ୟକ୍ତିରେ ଅନୁମତି ପ୍ରାପ୍ତ"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "ଅବୈଧ ଅକ୍ଷର '%c' ଦ୍ୱାରା ମୂଖ୍ୟ ଚାଳକ ନୋଡ"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "ତ୍ରୁଟିଯୁକ୍ତ ଖଣ୍ଡ ଅଭିବ୍ୟକ୍ତି '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "ଅବୈଧ ସେଟ ସଂଜ୍ଞା '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "ଅବୈଧ ଖଣ୍ଡ ସଂଜ୍ଞା '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "ଅବୈଧ ଆରେ ଅନୁକ୍ରମଣିକା ସଂଜ୍ଞା '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "ପ୍ରଚଳିତ ନୋଡଟି '%s' ପ୍ରକାରର ଅଟେ, କିନ୍ତୁ ଏକ ଆରେ ଅଥବା ବସ୍ତୁ ଆଶାକରାଯାଇଥିଲା।"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "ଅନୁକ୍ରମଣିକା '%d' ଟି ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ ଆରେ ଆକାର ଠାରୁ ବଡ଼ ଅଟେ।"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "ଅନୁକ୍ରମଣିକା '%d' ଟି ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ ବସ୍ତୁ ଆକାର ଠାରୁ ବଡ଼ ଅଟେ।"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ କୌଣସି ନୋଡ ଉପଲବ୍ଧ ନାହିଁ।"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ ଏକ '%s' କୁ ଧାରଣ କରିଥାଏ ଏବଂ କୌଣସି ଆରେକୁ ଧାରଣ କରିନଥାଏ"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "ପ୍ରଚଳିତ ନୋଡଟି '%s' ପ୍ରକାରର ଅଟେ, କିନ୍ତୁ ଏକ ବସ୍ତୁକୁ ଆଶାକରୁଥିଲା।"
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "'%s' ସଦସ୍ୟଟି ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ ବସ୍ତୁ ପାଖରେ ବ୍ୟାଖ୍ୟା କରିନାହିଁ।"
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ ଏକ '%s' କୁ ଧାରଣ କରିଥାଏ କିନ୍ତୁ କୌଣସି ବସ୍ତୁକୁ ଧାରଣ କରିନଥାଏ"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ ଏକ '%s' ଧାରଣ କରିଥାଏ କିନ୍ତୁ କୌଣସି ମୂଲ୍ୟ ଧାରଣ କରିନଥାଏ"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ କୌଣସି ବାକ୍ୟଖଣ୍ଡ ପ୍ରକାର ଧାରଣ କରିନଥାଏ"
# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
# This file is distributed under the same license as the json-glib package.
#
-# A S Alam <aalam@users.sf.net>, 2012.
+# A S Alam <aalam@users.sf.net>, 2012, 2013.
msgid ""
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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2012-05-16 07:30+0530\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\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"
"Language: pa\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
-msgstr ""
+msgstr "JSON ਆਬਜੈਕਟ ਦੀ ਮੰਗ ਸੀ, ਪਰ ਰੂਟ ਨੋਡ ਦੀ ਕਿਸਮ `%s' ਹੈ"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "JSON ਨੋਡ ਵਿੱਚ ਅਣਜਾਣ ਕਿਸਮ '%s'"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
-msgstr ""
+msgstr "JSON ਅਰੇ ਵਿੱਚ ਟਪਲ ਦੇਣ ਵਾਲੇ ਐਲੀਮੈਂਟ ਗੁੰਮ ਹਨ"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
-msgstr ""
+msgstr "GVariant ਟਪਲ ਕਿਸਮ ਵਿੱਚ ')' ਬੰਦ ਕਰਨ ਨਿਸ਼ਾਨ ਗੁੁੰਮ ਹੈ"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
-msgstr ""
+msgstr "JSON ਅਰੇ ਵਿੱਚ ਵਾਧੂ ਐਲੀਮੈਂਟ ਦੀ ਮੰਗ ਸੀ"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
-msgstr ""
+msgstr "GVariant ਲਈ ਬਦਲਣ ਲਈ ਗਲਤ ਸਤਰ ਮੁੱਲ"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
-msgstr ""
+msgstr "GVariant ਡਿਕਸ਼ਨਰੀ ਐਂਟਰਈ ਲਈ ਇੱਕ ਮੈਂਬਰ ਲਈ ਠੀਕ JSON ਆਬਜੈਕਟ ਦੀ ਮੰਗ ਸੀ"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "GVariant ਕਲਾਸ '%c' ਸਹਾਇਕ ਨਹੀਂ"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "ਅਢੁੱਕਵਾਂ GVariant ਦਸਤਖਤ"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "JSON ਡਾਟਾ ਖਾਲੀ ਹੈ।"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: ਪਾਰਸ ਗਲਤੀ: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: ਪਾਰਸ ਗਲਤੀ: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
-msgstr ""
+msgstr "JSONPath ਸਮੀਕਰਨ ਵਿੱਚ ਇੱਕ ਰੂਟ ਨੋਡ ਹੀ ਮਨਜ਼ੂਰ ਸੀ"
#: json-glib/json-path.c:384
#, c-format
msgid "Root node followed by invalid character '%c'"
-msgstr ""
+msgstr "ਗਲਤ ਅੱਖਰ '%c' ਦੇ ਬਾਅਦ ਰੂਟ ਨੋਡ"
#: json-glib/json-path.c:490
#, c-format
msgid "Malformed slice expression '%*s'"
-msgstr ""
+msgstr "ਨਿਕਾਰਾ ਭਾਗ ਸਮੀਕਰਨ '%*s'"
#: json-glib/json-path.c:534
#, c-format
msgid "Invalid set definition '%*s'"
-msgstr ""
+msgstr "ਗਲਤ ਸੈੱਟ ਪ੍ਰੀਭਾਸ਼ਾ '%*s'"
#: json-glib/json-path.c:587
#, c-format
msgid "Invalid slice definition '%*s'"
-msgstr ""
+msgstr "ਗਲਤ ਭਾਗ ਪ੍ਰੀਭਾਸ਼ਾ '%*s'"
#: json-glib/json-path.c:615
#, c-format
msgid "Invalid array index definition '%*s'"
-msgstr ""
+msgstr "ਗਲਤ ਅਰੇ ਇੰਡੈਕਸ ਪ੍ਰੀਭਾਸ਼ਾ '%*s'"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
-msgstr ""
+msgstr "ਮੌਜੂਦਾ ਨੋਡ ਦੀ '%s' ਕਿਸਮ ਹੈ, ਪਰ ਅਰੇ ਜਾਂ ਆਬਜੈਕਟ ਦੀ ਮੰਗ ਸੀ।"
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
-msgstr ""
+msgstr "ਇੰਡੈਕਸ '%d' ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਅਰੇ ਦੇ ਆਕਾਰ ਤੋਂ ਵੱਧ ਹੈ।"
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
-msgstr ""
+msgstr "ਇੰਡੈਕਸ '%d' ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਆਬਜੈਕਟ ਦੇ ਆਕਾਰ ਤੋਂ ਵੱਧ ਹੈ।"
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਕੋਈ ਵੀ ਨੋਡ ਉਪਲੱਬਧ ਨਹੀਂ"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
-msgstr ""
+msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ ਨਾ ਕਿ ਅਰੇ"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
-msgstr ""
+msgstr "ਮੌਜੂਦਾ ਨੋਡ ਦੀ '%s' ਕਿਸਮ ਹੈ, ਪਰ ਆਬਜੈਕਟ ਦੀ ਮੰਗ ਸੀ।"
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
-msgstr ""
+msgstr "ਮੈਂਬਰ '%s' ਨੂੰ ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਆਬਜੈਕਟ ਵਿੱਚ ਪ੍ਰਭਾਸ਼ਿਤ ਹੈ।"
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ ਨਾ ਕਿ ਆਬਜੈਕਟ"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ, ਮੁੱਲ ਨਹੀਂ"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr ""
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr ""
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
-msgstr ""
-
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr ""
+msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ ਸਤਰ ਕਿਸਮ ਨਹੀਂ ਰੱਖਦਾ ਹੈ"
# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
# gnomepl@aviary.pl
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2013.
+# Aviary.pl <gnomepl@aviary.pl>, 2011-2013.
msgid ""
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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2011-09-09 16:28+0200\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-02-17 20:13+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <gnomepl@aviary.pl>\n"
"Language: pl\n"
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Oczekiwano obiektu JSON, ale typ głównego węzła to \"%s\""
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Nieoczekiwany typ \"%s\" w węźle JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Brak elementów w tablicy JSON, aby zgadzało się z krotką"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Brak zamykającego symbolu \")\" w typie krotki GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Nieoczekiwane dodatkowe elementy w tablicy JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Nieprawidłowa wartość ciągu konwertowanego do GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Wpis słownika GVariant oczekuje obiektu JSON z dokładnie jednym elementem"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Klasa GVariant \"%c\" jest nieobsługiwana"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Nieprawidłowy podpis GVariant"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Dane JSON są puste"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: błąd przetwarzania: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: błąd przetwarzania: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Nieprawidłowe określenie indeksu tablicy \"%*s\""
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "Bieżący węzeł jest typu \"%s\", a oczekiwano tablicy lub obiektu."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "Indeks \"%d\" jest większy niż rozmiar tablicy w bieżącym położeniu."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "Indeks \"%d\" jest większy niż rozmiar obiektu w bieżącym położeniu."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Brak węzłów dostępnych w bieżącym położeniu"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "Bieżące położenie przechowuje \"%s\", a nie tablicę"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Bieżący węzeł jest typu \"%s\", a oczekiwano obiektu."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Element \"%s\" nie jest określony w obiekcie w bieżącym położeniu."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Bieżące położenie przechowuje \"%s\", a nie obiekt"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Bieżące położenie przechowuje \"%s\", a nie wartość"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Bieżące położenie nie przechowuje typu liczby całkowitej"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Bieżące położenie nie przechowuje typu liczby zmiennoprzecinkowej"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
-msgstr "Bieżące położenie nie przechowuje typu typu ciągu"
-
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Bieżące położenie nie przechowuje typu zmiennej logicznej"
+msgstr "Bieżące położenie nie przechowuje typu ciągu"
--- /dev/null
+# json-glib's Portuguese translation.\r
+# Copyright © 2012, 2013 json-glib\r
+# This file is distributed under the same license as the json-glib package.\r
+# Duarte Loreto <happyguy_pt@hotmail.com>, 2012, 2013.\r
+# \r
+msgid ""
+msgstr ""
+"Project-Id-Version: 3.8\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
+"glib\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-03-15 01:05+0100\n"
+"Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
+"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Esperado um objeto JSON, mas o nó raiz é do tipo `%s'"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Tipo '%s' inesperado no nó JSON"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Elementos em falta na lista JSON para respeitar uma enupla"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Falta o símbolo de fecho ')' no tipo de enupla GVariant"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Elementos extra inesperados na lista JSON"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Valor inválido de expressão ao converter em GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Uma entrada de dicionário GVariant espera um objeto JSON com exatamente um "
+"membro"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Classe GVariant '%c' não suportada"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Assinatura GVariant inválida"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "Dados JSON estão vazios"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Erro de processamento: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Apenas um nó raiz é permitido numa expressão JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Nó raiz seguido do caracter inválido '%c'"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Expressão '%*s' de fatia mal-formada"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Definição inválida de conjunto '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Definição inválida de fatia '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Definição inválida de índice de lista '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "O nó atual é do tipo '%s', mas era esperada uma lista ou um objeto."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "O índice '%d' é maior do que o tamanho da lista na posição atual."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "O índice '%d' é maior do que o tamanho do objeto na posição atual."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Nenhum nó disponível na posição atual"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "A posição atual contém um '%s' e não uma lista"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "O nó atual é do tipo '%s', mas era esperado um objeto."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "O membro '%s' não está definido no objeto da posição atual."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "A posição atual contém um '%s' e não um objeto"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "A posição atual contém um '%s' e não um valor"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "A posição atual não contém um tipo expressão"
"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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2012-02-19 23:29-0200\n"
-"Last-Translator: Gabriel Speckhahn <gabspeck@gmail.com>\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-26 16:32-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"X-Generator: Virtaal 0.7.0\n"
"X-Project-Style: gnome\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Objeto JSON esperado, porém o nó raiz é do tipo \"%s\""
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Tipo inesperado \"%s\" no nó JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Faltam elementos no vetor JSON para que se forme uma tupla"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Símbolo de fechamento \")\" ausente no tipo de tupla GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Elementos adicionais inesperados no vetor JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Valor string inválido ao converter para GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Uma entrada de dicionário GVariant espera um objeto JSON com exatamente um "
"membro"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Não há suporte para a classe GVariant \"%c\""
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Assinatura GVariant inválida"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Dados JSON vazios"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: Erro na análise: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d%d: Erro na análise: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Definição de índice de vetor %*s\" inválida"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "O nó atual é do tipo \"%s\", mas um vetor ou objeto era esperado."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "O índice \"%d\" é maior do que o tamanho do vetor na posição atual."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "O índice \"%d\" é maior do que o tamanho do objeto na posição atual."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Nenhum nó disponível na posição atual"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "A posição atual detém um \"%s\" e não um vetor"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "O nó atual é do tipo \"%s\", mas um objeto era esperado."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "O membro \"%s\" não está definido no objeto na posição atual."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "A posição atual detém um \"%s\" e não um objeto"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "A posição atual detém um \"%s\" e não um valor"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "A posição atual não detém um tipo inteiro"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "A posição atual não detém um tipo de ponto flutuante"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "A posição atual não detém um tipo string"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "A posição atual não detém um tipo booleano"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "A posição atual não detém um tipo inteiro"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "A posição atual não detém um tipo de ponto flutuante"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "A posição atual não detém um tipo booleano"
# This file is distributed under the same license as the json-glib package.
#
# Юрий Козлов <yuray@komyakino.ru>, 2012.
+# Yuri Myasoedov <omerta13@yandex.ru>, 2012.
+#
msgid ""
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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2012-06-16 08:29+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-11-04 21:15+0400\n"
+"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
+"Language-Team: русский <gnome-cyr@gnome.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Generator: Lokalize 1.2\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Ожидается объект JSON, но корневой узел имеет тип «%s»"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Неожиданный тип «%s» в узле JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Отсутствуют элементы в массиве JSON для соответствия кортежу"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Отсутствует закрывающий символ «)» в кортеже типа GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Неожиданные дополнительные символы в массиве JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Некорректное строковое значение для преобразования к GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Элемент словаря GVariant должен быть объектом JSON с единственным членом"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Класс GVariant «%c» не поддерживается"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Недопустимая подпись GVariant"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Данные JSON отсутствуют"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: Ошибка разбора: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: ошибка разбора: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Неверное определение индекса массива «%*s»"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "Текущий узел имеет тип «%s», но ожидается массив или объект."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "В текущей позиции индекс «%d» больше размера массива."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "В текущей позиции индекс «%d» больше размера объекта."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "В текущей позиции отсутствует узел"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
-msgstr "В текущей позиции содержится «%s» и это не массив"
+msgstr "В текущей позиции содержится «%s», а не массив"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Текущий узел имеет тип «%s», но ожидается объект."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "В текущей позиции член «%s» не определён в объекте."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
-msgstr "В текущей позиции содержится «%s» и это не объект"
+msgstr "В текущей позиции содержится «%s», а не объект"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
-msgstr "В текущей позиции содержится «%s» и это не значение"
+msgstr "В текущей позиции содержится «%s», а не значение"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "В текущей позиции не содержится значения целого"
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "В текущей позиции не содержится строковое значение"
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "В текущей позиции не содержится значения с плавающей точкой"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "В текущей позиции не содержится значения целого"
-#: json-glib/json-reader.c:963
-msgid "The current position does not hold a string type"
-msgstr "В текущей позиции не содержится значения строки"
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "В текущей позиции не содержится значения с плавающей точкой"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "В текущей позиции не содержится логического значения"
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "В текущей позиции не содержится логического значения"
--- /dev/null
+# Slovak translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Pavol Klačanský <pavol@klacansky.com>, 2012.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-11-17 20:46+0100\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
+"Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Očakáva sa objekt JSON, ale koreňový uzol je typu „%s“"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Neočakávaný typ „%s“ v uzle JSON"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Chýbajú prvky v poli JSON na zmenu n-tice"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Chýba uzatvárací symbol „)“ v type n-tica pre GVariant"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Neočakávané nadbytočné prvky v poli JSON"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Neplatná hodnota reťazca, ktorý sa má konvertovať na typ GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"Položka typu slovník pre GVariant očakáva objekt JSON s presne jedným členom"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Trieda pre GVariant „%c“ nie je podporovaná"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Neplatný podpis pre GVariant"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "Dáta JSON sú prázdne"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Chyba analýzy: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Vo výraze JSONPath môže byť len jeden koreňový uzol"
+
+#: json-glib/json-path.c:384
+#, 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:490
+#, 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:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Neplatná definícia množiny „%*s“"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Neplatná definícia výseku „%*s“"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Neplatná definícia indexu poľa „%*s“"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Bolo očakávané pole alebo objekt, ale aktuálny uzol je typu „%s“."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+"Index s hodnotou „%d“ poľa na aktuálnej pozícii je väčší ako jeho veľkosť."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+"Index s hodnotou „%d“ objektu na aktuálnej pozícii je väčší ako jeho veľkosť."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Na aktuálnej pozícii nie je dostupný žiadny uzol"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Na aktuálnej pozícii je „%s“ a nie pole"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Bol očakávaný objekt, ale aktuálny uzol je typu „%s“."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Člen „%s“ nie je definovaný v objekte na aktuálnej pozícii."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Na aktuálnej pozícii je „%s“ a nie objekt"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Na aktuálnej pozícii je „%s“ a nie hodnota"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Na aktuálnej pozícii je „%s“ a nie reťazec"
"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: 2012-06-30 15:20+0100\n"
-"PO-Revision-Date: 2011-12-26 18:50+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-10-25 19:20+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
"Language: sl\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Pričakovan je predmet JSON, vendar pa je korensko vozlišče vrste `%s'"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Nepričakovana vrsta '%s' v vozlišču JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Manjkajo predmeti v polju JSON za skladnost z n-terico."
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Manjka zaključni znak ')' v vrsti n-terice GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Nepričakovan dodatni predmet polja JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Neveljavna vrednost niza med pretvarjanjem v GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr "Slovar GVariant pričakuje predmet JSON z natanko enim določilom"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Razred GVariant '%c' ni podprt."
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Neveljaven podpis GVariant"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Podatki JSON so prazni"
-#: json-glib/json-parser.c:818
+#: json-glib/json-parser.c:825
#, c-format
-msgid "%s:%d: Parse error: %s"
-msgstr "%s:%d: Napaka razčlenjevanja: %s"
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: napaka razčlenjevanje: %s"
#: json-glib/json-path.c:375
msgid "Only one root node is allowed in a JSONPath expression"
msgid "Invalid array index definition '%*s'"
msgstr "Neveljavno določilo kazala polja '%*s'"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "Trenutno vozlišče je vrste '%s', pričakovano pa je polje ali predmet."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "Kazalo '%d' je večje od velikosti polja na trenutnem položaju."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "Kazalo '%d' je večje od velikosti predmeta na trenutnem položaju."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Na trenutnem položaju ni razpoložljivega vozlišča."
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "Trenutni položaj vsebuje '%s' in ne polja"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Trenutno vozlišče je vrste '%s', pričakovan pa je predmet."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Določilo '%s' ni določan v predmetu na trenutnem položaju."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Trenutni položaj vsebuje '%s' in ne predmeta"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Trenutni položaj vsebuje '%s' in ne vrednosti"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Trenutni položaj ne vsebuje celega števila"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Trenutni položaj ne vsebuje plavajoče vejice"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Trenutni položaj ne vsebuje niza"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Trenutni položaj ne vsebuje logične izraza"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "Trenutni položaj ne vsebuje celega števila"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "Trenutni položaj ne vsebuje plavajoče vejice"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "Trenutni položaj ne vsebuje logične izraza"
--- /dev/null
+# Serbian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-01-19 11:45+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Очекујем ЈСОН објекат, али корени чвор је врсте „%s“"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Неочекивана врста „%s“ у ЈСОН чвору"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Недостају елементи у ЈСОН низу да би био у складу са n-торком"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Недостаје симбол затварања „)“ у врсти n-торке Гваријанта"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Неочекивани додатни елементи у ЈСОН низу"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Неисправна вредност ниске претварајући у Гваријант"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Унос речника Гваријанта очекује ЈСОН објекат са тачно једним чланом"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Разред Гваријанта „%c“ није подржан"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Неисправан потпис Гваријанта"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "ЈСОН подаци су празни"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Грешка обраде: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Само један корени чвор је допуштен у изразу ЈСОНПутање"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "За кореним чвором следи неисправан знак „%c“"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Неисправан израз исечка „%*s“"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Неисправна одредница скупа „%*s“"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Неисправна одредница исечка „%*s“"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Неисправна одредница регистра низа „%*s“"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Тренутни чвор је врсте „%s“, али је очекиван низ или објекат."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Регистар „%d“ је већи од величине низа на тренутном положају."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Регистар „%d“ је већи од величине објекта на тренутном положају."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Ниједан чвор није доступан на тренутном положају"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Тренутни положај садржи „%s“ а не низ"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Тренутни чвор је врсте „%s“, али је очекиван објекат."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Члан „%s“ није одређен у објекту на тренутном положају."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Тренутни положај садржи „%s“ а не објекат"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Тренутни положај садржи „%s“ а не вредност"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Тренутни положај не садржи врсту ниске"
--- /dev/null
+# Serbian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-01-19 11:45+0200\n"
+"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr@latin\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Očekujem JSON objekat, ali koreni čvor je vrste „%s“"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Neočekivana vrsta „%s“ u JSON čvoru"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Nedostaju elementi u JSON nizu da bi bio u skladu sa n-torkom"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Nedostaje simbol zatvaranja „)“ u vrsti n-torke Gvarijanta"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Neočekivani dodatni elementi u JSON nizu"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Neispravna vrednost niske pretvarajući u Gvarijant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Unos rečnika Gvarijanta očekuje JSON objekat sa tačno jednim članom"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Razred Gvarijanta „%c“ nije podržan"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Neispravan potpis Gvarijanta"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON podaci su prazni"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: Greška obrade: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Samo jedan koreni čvor je dopušten u izrazu JSONPutanje"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Za korenim čvorom sledi neispravan znak „%c“"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Neispravan izraz isečka „%*s“"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Neispravna odrednica skupa „%*s“"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Neispravna odrednica isečka „%*s“"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Neispravna odrednica registra niza „%*s“"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "Trenutni čvor je vrste „%s“, ali je očekivan niz ili objekat."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Registar „%d“ je veći od veličine niza na trenutnom položaju."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Registar „%d“ je veći od veličine objekta na trenutnom položaju."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Nijedan čvor nije dostupan na trenutnom položaju"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Trenutni položaj sadrži „%s“ a ne niz"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Trenutni čvor je vrste „%s“, ali je očekivan objekat."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Član „%s“ nije određen u objektu na trenutnom položaju."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Trenutni položaj sadrži „%s“ a ne objekat"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Trenutni položaj sadrži „%s“ a ne vrednost"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "Trenutni položaj ne sadrži vrstu niske"
"Project-Id-Version: json-glib\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"
"glib\n"
-"POT-Creation-Date: 2012-06-30 15:20+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
"PO-Revision-Date: 2012-01-22 00:38+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr ""
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Oväntad typ \"%s\" i JSON-nod"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr ""
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr ""
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Oväntade extra-element i JSON-array"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Ogiltig strängvärdeskonvertering till GVariant"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "GVariant-klassen \"%c\" stöds inte"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Ogiltig GVariant-signatur"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "JSON-data är tom"
-#: json-glib/json-parser.c:818
-#, c-format
-msgid "%s:%d: Parse error: %s"
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
msgstr "%s:%d: Tolkningsfel: %s"
#: json-glib/json-path.c:375
msgid "Invalid array index definition '%*s'"
msgstr ""
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr ""
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr ""
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr ""
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Ingen nod tillgänglig på aktuell position"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "Aktuell position innehåller en \"%s\" och inte en array"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr ""
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Medlemmen \"%s\" är inte definierad i objektet på aktuell position."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Aktuell position innehåller en \"%s\" och inte ett objekt"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Aktuell position innehåller en \"%s\" och inte ett värde"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Aktuell position innehåller inte en heltalstyp"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Aktuell position innehåller inte en flyttalstyp"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Aktuell position innehåller inte en strängtyp"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Aktuell position innehåller inte en boolesk typ"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "Aktuell position innehåller inte en heltalstyp"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "Aktuell position innehåller inte en flyttalstyp"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "Aktuell position innehåller inte en boolesk typ"
--- /dev/null
+# Telugu translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# Copyright (C) 2012, Swecha Localisation Team <localization@swecha.net>
+# This file is distributed under the same license as the json-glib package.
+#
+# sasi <sasi@swecha.net>, 2012.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: te\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "ఒక JSON అంశంకు అవకాశం ఉంది, కానీ రూట్ నోడ్`% s' రకంగా ఉంటుంది "
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "ఊహించని రకం '% s' JSON నోడ్ లో"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "ఒక క్రమానుగుణ శ్రేణి కోసం JSON శ్రేణిలో తప్పిన అంశాలు "
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "GVariant tuple రకంలో ముగింపు చిహ్నం ')' లేదు"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON శ్రేణి లో ఊహించని అదనపు అంశాలు "
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "GVariant మారిన చెల్లని స్ట్రింగ్ విలువ "
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "ఒక GVariant నిఘంటువు ఎంట్రీ సరిగ్గా ఒక సభ్యుడుగా ఉంటుందని ఒక JSON అంశం అంచనా "
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant తరగతి '%c'మద్దతు లేదు"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "చెల్లని GVariant సంతకం"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON డేటా ఖాళీగా ఉంది"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "% s:% d: అన్వయ దోషం:% s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "కేవలం ఒక రూట్ నోడ్కు ఒక JSONPath వ్యక్తీకరణ లో అనుమతి ఉంది"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "చెల్లని అక్షరం '%c' తర్వాత రూట్ నోడ్"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "తప్పుడు ముక్క వ్యక్తీకరణ '%*s'"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "చెల్లని వరు నిర్వచనం '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "చెల్లని ముక్క నిర్వచనం '%*s'"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "చెల్లని వరు సూచిక నిర్వచనం '%*s'"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "ప్రస్తుత నోడ్ రకం '%s' యొక్క, కానీ ఒక విన్యాసం లేదా ఒక వస్తువు భావించారు."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "ఇండెక్స్ '%d' ప్రస్తుత స్థితి వద్ద శ్రేణి యొక్క పరిమాణం కంటే ఎక్కువగా ఉంటుంది."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "ఇండెక్స్ '%d' ప్రస్తుత స్థితి వద్ద వస్తువు యొక్క పరిమాణం కంటే ఎక్కువగా ఉంటుంది."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "ప్రస్తుత స్థానంలో అందుబాటులో లేదు నోడ్ "
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "ప్రస్తుత స్థితి ఒక '%s'కలిగి ఉంది మరియు వరుస కాదు "
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "ప్రస్తుత నోడ్ '%s' యొక్క రకం, కానీ ఒక వస్తువుని భావించారు."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "సభ్యుడు '%s', ప్రస్తుత స్థితి వద్ద అంశం వివరించబడలేదు."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "ప్రస్తుత స్థితి ఒక '%s' కలిగి ఉంది మరియు ఒక వస్తువు కాదు "
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "ప్రస్తుత స్థితి ఒక '%s'కలిగి ఉంది మరియు ఒక విలువ కాదు "
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "ప్రస్తుత స్థితి పదాల రకం కలిగి లేదు"
--- /dev/null
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Victor Ibragimov <victor.ibragimov@gmail.com>, 2013.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-01-21 18:08+0500\n"
+"Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
+"Language-Team: \n"
+"Language: tg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr ""
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr ""
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr ""
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr ""
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr ""
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr ""
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr ""
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr ""
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr ""
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr ""
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr ""
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Таърифи маҷмӯи \"%*s\" беэътибор аст"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr ""
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Таърифи индекси қатори \"%*s\" беэътибор аст"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr ""
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr ""
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr ""
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr ""
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr ""
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr ""
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr ""
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr ""
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+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: 2012-06-30 15:20+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\n"
"PO-Revision-Date: 2011-11-16 12:18+0200\n"
"Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
"Language-Team: Turkish <gnome-turk@gnome.org>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.2\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Bir JSON nesnesi bekleniyor, ama kök düğümü `%s' türünde"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "JSON düğümünde beklenmeyen '%s' türü"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "JSON dizisinin bir demete uyması için gereken öğeler eksik"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "GVariant demeti türünde kapatma sembolü ')' eksik"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "JSON dizisinde beklenmeyen ek öğeler"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "GVariant'a dönüştürmede geçersiz dizge değeri"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr ""
"Bir GVariant sözlük girdisi, tam olarak bir üyesi olan JSON nesnesi bekler"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "GVariant sınıfı '%c' desteklenmiyor"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Geçersiz GVariant imzası"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "JSON verisi boş"
-#: json-glib/json-parser.c:818
-#, c-format
-msgid "%s:%d: Parse error: %s"
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
msgstr "%s:%d: Ayrıştırma hatası: %s"
#: json-glib/json-path.c:375
msgid "Invalid array index definition '%*s'"
msgstr "Geçersiz dizi indisi tanımı '%*s'"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "Geçerli düğümün türü '%s', ama bir dizi ya da bir nesne bekleniyordu."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "'%d' indisi, geçerli konumdaki dizinin boyutundan daha büyük."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "'%d' indisi, geçerli konumdaki nesnenin boyutundan daha büyük."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Geçerli konumda kullanılabilir düğüm yok"
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr "Geçerli konum bir dizi değil '%s' bulunduruyor"
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Geçerli düğümün türü '%s', ama bir nesne bekleniyordu."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "'%s' üyesi, geçerli konumdaki nesnede tanımlı değil."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Geçerli konum bir nesne değil '%s' bulunduruyor"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Geçerli konum bir değer değil '%s' bulunduruyor"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Geçerli konum bir tamsayı türü bulundurmuyor"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Geçerli konum bir kayan noktalı tür bulundurmuyor"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Geçerli konum bir dizge türü bulundurmuyor"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Geçerli konum bir mantıksal doğru/yanlış türü bulundurmuyor"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "Geçerli konum bir tamsayı türü bulundurmuyor"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "Geçerli konum bir kayan noktalı tür bulundurmuyor"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "Geçerli konum bir mantıksal doğru/yanlış türü bulundurmuyor"
--- /dev/null
+# Uyghur translation for json-glib.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Gheyret Kenji <gheyret@gmail.com>, YEAR.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\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"
+"Language: ug\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr ""
+"ئەسلى JSON نەڭى بولۇشقا تېگىشلىك ئىدى، بىراق غول تۈگۈننىڭ تىپى «%s» ئىكەن"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "ھازىر JSON تۈگۈننىڭ تىپى ‹%s› بولۇپ قېلىپتۇ"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr ""
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr ""
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "ھازىر JSON تىزىقىدا ئارتۇقچە ئېلېمېنت بار ئىكەن"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "تېكىستنىڭ قىممىتىنى GVariant قا ئايلاندۇرغىلى بولمايدىكەن"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr ""
+"ئادەتتە GVariant لۇغەت ئېلېمېنتى چوقۇم بىرلا ئەزايى بار بولغان JSON نەڭى "
+"بولۇشى كېرەك"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant تىپ ‹%c› نى قوللىمايدۇ"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "ئىناۋەتسىز GVariant ئىمزاسى"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON سانلىق-مەلۇماتى قۇرۇق"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d:%d: پارچىلاشتا خاتالىق كۆرۈلدى: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr ""
+"ئادەتتە JSONPath ئىپادىسىدە پەقەت بىرلا غول ئېلېمېنتقا ئىجازەت بېرىلگەن"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "پەقەت بىرلا غول ئېلېمېنت كەينىدە ‹%c› دېگەن ھەرپ بار ئىكەن"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "بولمىغۇر كەسمە ئىپادىسى ‹%*s›"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "توپلام ئېنىقلىمىسى ئىناۋەتسىز ‹%*s›"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "كەسمە(slice) ئېنىقلىمىسى ئىناۋەتسىز ‹%*s›"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "تىزىق ئىندېكس ئېنىقلىمىسى ئىناۋەتسىز ‹%*s›"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"نۆۋەتتىكى تۈگۈننىڭ تىپى ‹%s›، بىراق بۇ يەرگە تىزىق ياكى بىر نەڭ كەلسە بولاتتى"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "ئىندېكس ‹%d› ، نۆۋەتتىكى ئورۇندىكى تىزىقنىڭ چوڭلۇقىدىن چوڭ."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "ئىندېكس ‹%d› ، نۆۋەتتىكى ئورۇندىكى نەڭنىڭ چوڭلۇقىدىن چوڭ."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "نۆۋەتتىكى ئورۇندا تۈگۈن يوق"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "نۆۋەتتىكى ئورۇندىكىسى ‹%s› بولۇپ، تىزىق ئەمەس"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "نۆۋەتتىكى ئورۇندىكى تۈگۈننىڭ تىپى ‹%s›، بىراق نەڭ كەلسە بولاتتى."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "نۆۋەتتىكى ئورۇندىكى نەڭدە ‹%s› دېگەن ئەزا ئېنىقلانمىغان."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "نۆۋەتتىكى ئورۇندىكىسى ‹%s› بولۇپ، نەڭ ئەمەس"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "نۆۋەتتىكى ئورۇندىكىسى ‹%s› بولۇپ، قىممەت ئەمەس"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "نۆۋەتتىكى ئورۇندىكىسىنىڭ تىپى تېكىست ئەمەس"
--- /dev/null
+# Ukrainian translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# Daniel <ted.korostiled@gmail.com>, 2012.
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-08-16 09:51-0700\n"
+"Last-Translator: Daniel <ted.korostiled@gmail.com>\n"
+"Language-Team: translation@linux.org.ua\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "Очікування об'єкта JSON, але кореневий вузол є типом «%s»"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "Очікуваний тип «%s» у вузлі JSON"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "Бракує елементів у масиві JSON для підтвердження кортежу"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "Бракує символу закривання «)» у типі кортежу GVariant"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "Неочікуваний додатковий елемент у масиві JSON"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "Неправильне перетворення значення рядка в GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "Запис словника GVariant очікує об'єкт JSON з тільки однією частиною"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "Клас GVariant «%c» не підтримується"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "Неправильний підпис GVariant"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "Дані JSON порожні"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d: Помилка розбирання: %s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "Дозволено тільки один кореневий вузол у виразі JSONPath"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "Кореневий вузол супроводжується неправильним символом «%c»"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "Неправильний вираз шару «%*s»"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "Неправильне визначення набору «%*s»"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "Неправильне визначення шару «%*s»"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "Неправильне визначення покажчика масиву «%*s»"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr ""
+"Поточний вузол має тип «%s», однак масив або об'єкт не були очікуваними."
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "Покажчик «%d» більший за розмір масиву на поточній позиції."
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "Покажчик «%d» більший за розмір об'єкта на поточній позиції."
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "Немає жодного доступного вузла на поточній позиції"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "Поточна позиція утримує «%s» і не є масивом"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "Поточний вузол має тип «%s», однак об'єкт не був очікуваними."
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "Частину «%s» не визначено в об'єкті на поточні позиції."
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "Поточна позиція утримує «%s» і не є об'єктом"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "Поточна позиція утримує «%s» і не є значенням"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+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: 2012-06-30 15:20+0100\n"
+"POT-Creation-Date: 2013-04-16 20:00+0100\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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: json-glib/json-gobject.c:934
+#: json-glib/json-gobject.c:925
#, c-format
msgid "Expecting a JSON object, but the root node is of type `%s'"
msgstr "Cần đối tượng JSON nhưng nút gốc thuộc loại '%s'"
-#: json-glib/json-gvariant.c:539
+#: json-glib/json-gvariant.c:540
#, c-format
msgid "Unexpected type '%s' in JSON node"
msgstr "Cần loại '%s' trong nút JSON"
-#: json-glib/json-gvariant.c:609
+#: json-glib/json-gvariant.c:610
msgid "Missing elements in JSON array to conform to a tuple"
msgstr "Thiếu phần tử trong mảng JSON để tuân thủ ống"
-#: json-glib/json-gvariant.c:637
+#: json-glib/json-gvariant.c:638
msgid "Missing closing symbol ')' in the GVariant tuple type"
msgstr "Thiếu dấu đóng ')' trong loại ống GVariant"
-#: json-glib/json-gvariant.c:645
+#: json-glib/json-gvariant.c:646
msgid "Unexpected extra elements in JSON array"
msgstr "Cần phần tử bổ sung trong mảng JSON"
-#: json-glib/json-gvariant.c:924
+#: json-glib/json-gvariant.c:925
msgid "Invalid string value converting to GVariant"
msgstr "Giá trị chuỗi chuyển đổi sang GVariant không hợp lệ"
-#: json-glib/json-gvariant.c:980
+#: json-glib/json-gvariant.c:981
msgid ""
"A GVariant dictionary entry expects a JSON object with exactly one member"
msgstr "Mục từ điển GVariant cần đối tượng JSON với duy nhất một phần tử"
-#: json-glib/json-gvariant.c:1236
+#: json-glib/json-gvariant.c:1237
#, c-format
msgid "GVariant class '%c' not supported"
msgstr "Không hỗ trợ lớp GVariant '%c'"
-#: json-glib/json-gvariant.c:1281
+#: json-glib/json-gvariant.c:1285
msgid "Invalid GVariant signature"
msgstr "Chữ ký GVariant không hợp lệ"
-#: json-glib/json-gvariant.c:1326
+#: json-glib/json-gvariant.c:1333
msgid "JSON data is empty"
msgstr "Dữ liệu JSON rỗng"
-#: json-glib/json-parser.c:818
-#, c-format
-msgid "%s:%d: Parse error: %s"
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
msgstr "%s:%d: Lỗi phân tích: %s"
#: json-glib/json-path.c:375
msgid "Invalid array index definition '%*s'"
msgstr "Định nghĩa chỉ mục mảng '%*s' không hợp lệ"
-#: json-glib/json-reader.c:463
+#: json-glib/json-reader.c:464
#, c-format
msgid ""
"The current node is of type '%s', but an array or an object was expected."
msgstr "Nút hiện thời loại '%s', nhưng đang cần mảng hoặc một đối tượng."
-#: json-glib/json-reader.c:475
+#: json-glib/json-reader.c:476
#, c-format
msgid ""
"The index '%d' is greater than the size of the array at the current position."
msgstr "Chỉ mục '%d' lớn hơn kích thước mảng tại vị trí hiện thời."
-#: json-glib/json-reader.c:492
+#: json-glib/json-reader.c:493
#, c-format
msgid ""
"The index '%d' is greater than the size of the object at the current "
"position."
msgstr "Chỉ mục '%d' lớn hơn kích thước đối tượng tại vị trí hiện thời."
-#: json-glib/json-reader.c:576 json-glib/json-reader.c:729
-#: json-glib/json-reader.c:780 json-glib/json-reader.c:818
-#: json-glib/json-reader.c:856 json-glib/json-reader.c:901
-#: json-glib/json-reader.c:946 json-glib/json-reader.c:991
-#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
msgid "No node available at the current position"
msgstr "Không có nút ở vị trí hiện thời."
-#: json-glib/json-reader.c:583
+#: json-glib/json-reader.c:584
#, c-format
msgid "The current position holds a '%s' and not an array"
msgstr ""
-#: json-glib/json-reader.c:646
+#: json-glib/json-reader.c:647
#, c-format
msgid "The current node is of type '%s', but an object was expected."
msgstr "Nút hiện thời thuộc loại '%s', nhưng đang cần đối tượng."
-#: json-glib/json-reader.c:653
+#: json-glib/json-reader.c:654
#, c-format
msgid "The member '%s' is not defined in the object at the current position."
msgstr "Chưa định nghĩa thành viên '%s' trong đối tượng tại vị trí hiện thời."
-#: json-glib/json-reader.c:736 json-glib/json-reader.c:787
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
#, c-format
msgid "The current position holds a '%s' and not an object"
msgstr "Vị trí hiện thời chứa '%s', không phải đối tượng"
-#: json-glib/json-reader.c:827 json-glib/json-reader.c:865
-#: json-glib/json-reader.c:910 json-glib/json-reader.c:955
-#: json-glib/json-reader.c:1000
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
#, c-format
msgid "The current position holds a '%s' and not a value"
msgstr "Vị trí hiện thời chứa '%s', không phải giá trị"
-#: json-glib/json-reader.c:873
-msgid "The current position does not hold an integer type"
-msgstr "Vị trí hiện thời không phải kiểu số nguyên"
-
-#: json-glib/json-reader.c:918
-msgid "The current position does not hold a floating point type"
-msgstr "Vị trí hiện thời không phải kiểu số thực"
-
-#: json-glib/json-reader.c:963
+#: json-glib/json-reader.c:950
msgid "The current position does not hold a string type"
msgstr "Vị trí hiện thời không phải kiểu chuỗi"
-#: json-glib/json-reader.c:1008
-msgid "The current position does not hold a boolean type"
-msgstr "Vị trí hiện thời không phải kiểu luận lý"
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "Vị trí hiện thời không phải kiểu số nguyên"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "Vị trí hiện thời không phải kiểu số thực"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "Vị trí hiện thời không phải kiểu luận lý"
--- /dev/null
+# Chinese (China) translation for json-glib ui.
+# Copyright (C) 2012 json-glib's authors and contributors.
+# This file is distributed under the same license as the json-glib package.
+# Cheng Lu <chenglu1990@gmail.com>, 2012.
+# Wylmer Wang <wantinghard@gmail.com>, 2012.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2012-07-22 13:22+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
+"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "期望一个 JSON 对象，但根节点类型是“%s”"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON 节点中存在异常的类型“%s”"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "在 JSON 数组中缺少用来构成 tuple(元组) 的元素"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "在 GVariant 元组类型中缺少闭合符号“)”"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "在 JSON 数组中存在意外的其他元素"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "字符串值到 GVariant 的转换无效"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "GVariant 字典记录期望仅有一个成员的 JSON 对象"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "不支持的 GVariant 类“%c”"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "无效的 GVariant 签名"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON 数据为空"
+
+#: json-glib/json-parser.c:825
+#, fuzzy, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s:%d：解析错误：%s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "JSONPath 表达式中只允许有一个根节点"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "根节点之后跟随了无效的字符“%c”"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "有错误的 slice 表达式“%*s”"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "无效的 set 定义 '%*s'"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "无效的 slice 定义“%*s”"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "无效的数组索引定义“%*s”"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "当前节点的类型是“%s”，应为数组或对象。"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "索引“%d”大于当前位置数组的大小。"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "索引“%d”大于当前位置对象的大小。"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "当前位置无节点可用"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "当前位置是一个“%s”，而不是一个数组"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "当前节点的类型是“%s”，但应为对象。"
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "成员“%s”没有在当前位置的对象中定义。"
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "当前位置是一个“%s”，而不是一个对象"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "当前位置是一个“%s”，不是一个值"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "当前位置不是一个字符串类型"
+
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "当前位置不是一个整数类型"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "当前位置不是一个浮点数类型"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "当前位置不是一个布尔(boolean)类型"
--- /dev/null
+# Chinese (Hong Kong) translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-02-04 20:32+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
+"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"Language: zh_HK\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "預期是 JSON 物件，但根節點卻是類型「%s」"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON 節點中未預期的類型「%s」"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "在 JSON 陣列中缺少確認變數值組"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "在 GVariant 變數值組類型中缺少關閉符號 ')'"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON 陣列中有未預期的額外元素"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "無效的字串數值轉換到 GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "GVariant 字典項目預期 JSON 物件只能有一個成員"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant 類別「%c」不支援"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "無效的 GVariant 簽署"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON 資料是空的"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s：%d：%d：解析錯誤：%s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "在 JSONPath 表示式中不允許一個根節點"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "根節點跟隨在無效的字符「%c」後"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "格式不良的片段表示式「%*s」"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "無效的組定義「%*s」"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "無效的片段定義「%*s」"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "無效的陣列索引定義「%*s」"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "目前的節點類型是「%s」，但預期應為陣列或物件。"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "索引「%d」大於目前位置的陣列大小。"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "索引「%d」大於目前位置的物件大小。"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "目前的位置沒有可用的節點"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "目前的位置持有一個「%s」，並非陣列"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "目前的節點類型是「%s」，但預期應為物件。"
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "成員「%s」並未在目前的位置的物件中定義。"
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "目前的位置持有一個「%s」，並非物件"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "目前的位置持有一個「%s」，並非數值"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "目前的位置並未持有字串類型"
+
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "目前的位置並未持有整數類型"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "目前的位置並未持有浮點數類型"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "目前的位置並未持有布林類型"
--- /dev/null
+# Chinese (Taiwan) translation for json-glib.
+# Copyright (C) 2012 json-glib's COPYRIGHT HOLDER
+# This file is distributed under the same license as the json-glib package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+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: 2013-04-16 20:00+0100\n"
+"PO-Revision-Date: 2013-02-04 19:02+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
+"Language-Team: Chinese (Taiwan) <chinese-l10n@googlegroups.com>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: json-glib/json-gobject.c:925
+#, c-format
+msgid "Expecting a JSON object, but the root node is of type `%s'"
+msgstr "預期是 JSON 物件，但根節點卻是類型「%s」"
+
+#: json-glib/json-gvariant.c:540
+#, c-format
+msgid "Unexpected type '%s' in JSON node"
+msgstr "JSON 節點中未預期的類型「%s」"
+
+#: json-glib/json-gvariant.c:610
+msgid "Missing elements in JSON array to conform to a tuple"
+msgstr "在 JSON 陣列中缺少確認變數值組"
+
+#: json-glib/json-gvariant.c:638
+msgid "Missing closing symbol ')' in the GVariant tuple type"
+msgstr "在 GVariant 變數值組類型中缺少關閉符號 ')'"
+
+#: json-glib/json-gvariant.c:646
+msgid "Unexpected extra elements in JSON array"
+msgstr "JSON 陣列中有未預期的額外元素"
+
+#: json-glib/json-gvariant.c:925
+msgid "Invalid string value converting to GVariant"
+msgstr "無效的字串數值轉換到 GVariant"
+
+#: json-glib/json-gvariant.c:981
+msgid ""
+"A GVariant dictionary entry expects a JSON object with exactly one member"
+msgstr "GVariant 字典項目預期 JSON 物件只能有一個成員"
+
+#: json-glib/json-gvariant.c:1237
+#, c-format
+msgid "GVariant class '%c' not supported"
+msgstr "GVariant 類別「%c」不支援"
+
+#: json-glib/json-gvariant.c:1285
+msgid "Invalid GVariant signature"
+msgstr "無效的 GVariant 簽章"
+
+#: json-glib/json-gvariant.c:1333
+msgid "JSON data is empty"
+msgstr "JSON 資料是空的"
+
+#: json-glib/json-parser.c:825
+#, c-format
+msgid "%s:%d:%d: Parse error: %s"
+msgstr "%s：%d：%d：解析錯誤：%s"
+
+#: json-glib/json-path.c:375
+msgid "Only one root node is allowed in a JSONPath expression"
+msgstr "在 JSONPath 表示式中不允許一個根節點"
+
+#: json-glib/json-path.c:384
+#, c-format
+msgid "Root node followed by invalid character '%c'"
+msgstr "根節點跟隨在無效的字元「%c」後"
+
+#: json-glib/json-path.c:490
+#, c-format
+msgid "Malformed slice expression '%*s'"
+msgstr "格式不良的片段表示式「%*s」"
+
+#: json-glib/json-path.c:534
+#, c-format
+msgid "Invalid set definition '%*s'"
+msgstr "無效的組定義「%*s」"
+
+#: json-glib/json-path.c:587
+#, c-format
+msgid "Invalid slice definition '%*s'"
+msgstr "無效的片段定義「%*s」"
+
+#: json-glib/json-path.c:615
+#, c-format
+msgid "Invalid array index definition '%*s'"
+msgstr "無效的陣列索引定義「%*s」"
+
+#: json-glib/json-reader.c:464
+#, c-format
+msgid ""
+"The current node is of type '%s', but an array or an object was expected."
+msgstr "目前的節點類型是「%s」，但預期應為陣列或物件。"
+
+#: json-glib/json-reader.c:476
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the array at the current position."
+msgstr "索引「%d」大於目前位置的陣列大小。"
+
+#: json-glib/json-reader.c:493
+#, c-format
+msgid ""
+"The index '%d' is greater than the size of the object at the current "
+"position."
+msgstr "索引「%d」大於目前位置的物件大小。"
+
+#: json-glib/json-reader.c:577 json-glib/json-reader.c:730
+#: json-glib/json-reader.c:781 json-glib/json-reader.c:819
+#: json-glib/json-reader.c:857 json-glib/json-reader.c:895
+#: json-glib/json-reader.c:933 json-glib/json-reader.c:978
+#: json-glib/json-reader.c:1014 json-glib/json-reader.c:1040
+msgid "No node available at the current position"
+msgstr "目前的位置沒有可用的節點"
+
+#: json-glib/json-reader.c:584
+#, c-format
+msgid "The current position holds a '%s' and not an array"
+msgstr "目前的位置持有一個「%s」，並非陣列"
+
+#: json-glib/json-reader.c:647
+#, c-format
+msgid "The current node is of type '%s', but an object was expected."
+msgstr "目前的節點類型是「%s」，但預期應為物件。"
+
+#: json-glib/json-reader.c:654
+#, c-format
+msgid "The member '%s' is not defined in the object at the current position."
+msgstr "成員「%s」並未在目前的位置的物件中定義。"
+
+#: json-glib/json-reader.c:737 json-glib/json-reader.c:788
+#, c-format
+msgid "The current position holds a '%s' and not an object"
+msgstr "目前的位置持有一個「%s」，並非物件"
+
+#: json-glib/json-reader.c:828 json-glib/json-reader.c:866
+#: json-glib/json-reader.c:904 json-glib/json-reader.c:942
+#: json-glib/json-reader.c:987
+#, c-format
+msgid "The current position holds a '%s' and not a value"
+msgstr "目前的位置持有一個「%s」，並非數值"
+
+#: json-glib/json-reader.c:950
+msgid "The current position does not hold a string type"
+msgstr "目前的位置並未持有字串類型"
+
+#~ msgid "The current position does not hold an integer type"
+#~ msgstr "目前的位置並未持有整數類型"
+
+#~ msgid "The current position does not hold a floating point type"
+#~ msgstr "目前的位置並未持有浮點數類型"
+
+#~ msgid "The current position does not hold a boolean type"
+#~ msgstr "目前的位置並未持有布林類型"
projects / platform / upstream / json-glib.git / commitdiff