commit cf3b1190cf239f4cf52af1ea3c4cb702eaa7b740 Author: Emmanuele Bassi Date: Wed Jun 15 11:20:15 2011 +0100 Release JSON-GLib 0.12.6 (release) NEWS | 6 ++++++ configure.ac | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) commit dadbfd97443970b547b147cf9e5c987a98dc3324 Author: Emmanuele Bassi Date: Thu Jun 9 17:23:04 2011 +0100 Remove G_CONST_RETURN usage See GLib bug: https://bugzilla.gnome.org/show_bug.cgi?id=644611 The macro is going to be deprecated soon. (cherry picked from commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6) Conflicts: json-glib/json-reader.c json-glib/json-reader.h json-glib/json-array.c | 2 +- json-glib/json-node.c | 6 +++--- json-glib/json-object.c | 2 +- json-glib/json-reader.c | 4 ++-- json-glib/json-reader.h | 4 ++-- json-glib/json-types-private.h | 2 +- json-glib/json-types.h | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) commit bfd3bf0142dc545a95bdb23a9317d89cd0f572b0 Author: Emmanuele Bassi Date: Fri Jun 3 11:18:27 2011 +0100 build: Remove deprecation disabling for GLib (cherry picked from commit 40611ace9568468ffba89bb6d0e79662fe53ca6b) Signed-off-by: Emmanuele Bassi json-glib/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit deb1fca120f205ef48354c38bd4e3055384270eb Author: Tristan Van Berkom Date: Tue May 3 00:20:12 2011 +0900 Fixed json_deserialize_pspec() to handle null nodes. This fixes deserialization to match serialization (bug 648539) (cherry picked from commit d3db7acc1f53491b6dd9637991a1eaf8bb5c5002) Signed-off-by: Emmanuele Bassi json-glib/json-gobject.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) commit 3d565abff70ec835b1bcaa7e970a27d18dca8ebb Author: Tristan Van Berkom Date: Sat Apr 23 18:15:37 2011 +0900 Warn from json_gobject_deserialize() if a listed property cannot be deserialized. (cherry picked from commit 9824a32a803bd194208d460068ce5ba91d776686) Signed-off-by: Emmanuele Bassi json-glib/json-gobject.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 942453647b168746da5d6db85e8436e75badde45 Author: Bastien Nocera Date: Thu Apr 21 02:29:53 2011 +0100 reader: Fix bug in example usage (cherry picked from commit 254e8e969968e7ed5f594238a980b20c6fabc46e) Signed-off-by: Emmanuele Bassi json-glib/json-reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1dc959790b04b055e393c28050083b7ddafba9e8 Author: Emmanuele Bassi Date: Sat May 28 11:36:55 2011 +0100 builder: Initialize state fields If we're calling g_free() on a field we better make sure that it's either NULL or contains valid data. https://bugzilla.gnome.org/show_bug.cgi?id=651271 (cherry picked from commit d784cc6825607c517d7565049108d1f908a1d71b) Signed-off-by: Emmanuele Bassi json-glib/json-builder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit c3519b4eddebdba3f27749b7c4849db4e6261b4f Author: Emmanuele Bassi Date: Tue Apr 12 08:53:26 2011 +0100 doap: Fix the URI for Bugzilla JSON-GLib uses the GNOME Bugzilla instance. json-glib.doap | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) commit 72001841f6af3c3c98a44c22645762d76b01c258 Author: Emmanuele Bassi Date: Tue Apr 12 08:53:13 2011 +0100 Post-release version bump to 0.12.5 configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)