diff -Nru json-glib-0.7.6/aclocal.m4 json-glib-0.10.2/aclocal.m4
--- json-glib-0.7.6/aclocal.m4	2009-08-12 16:07:29.000000000 +0100
+++ json-glib-0.10.2/aclocal.m4	2010-02-26 14:04:26.000000000 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  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.
@@ -300,16 +300,14 @@
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    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_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -353,9 +351,9 @@
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -402,10 +400,10 @@
 # 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.10'
+[am__api_version='1.11'
 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.10.2], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -421,7 +419,7 @@
 # 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.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -481,14 +479,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # 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 8
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -501,6 +499,7 @@
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -514,14 +513,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 # 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
+# serial 10
 
 # 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,
@@ -578,6 +577,16 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -595,7 +604,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # 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
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -605,19 +624,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # 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__minus_obj=
+      ;;
     none) break ;;
     esac
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -681,59 +704,61 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 4
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 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
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # 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
-  # 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.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # 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
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 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
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # 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
+    # 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.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # 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
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -765,13 +790,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 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 13
+# 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.
@@ -788,7 +813,7 @@
 # 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.60])dnl
+[AC_PREREQ([2.62])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
@@ -839,8 +864,8 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -848,24 +873,37 @@
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_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)],
+		  [define([AC_PROG_CC],
+			  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)],
+		  [define([AC_PROG_CXX],
+			  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)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])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_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 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],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
@@ -888,7 +926,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -899,7 +937,14 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -925,13 +970,13 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  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
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -940,7 +985,7 @@
 [am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -950,24 +995,24 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# 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
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
@@ -975,16 +1020,51 @@
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # 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
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -1001,7 +1081,14 @@
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -1072,14 +1159,14 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 # 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
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -1088,16 +1175,29 @@
 # 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='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
 # 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`
+   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`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -1122,6 +1222,33 @@
 fi
 AC_MSG_RESULT(yes)])
 
+# Copyright (C) 2009  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_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`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]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1150,18 +1277,25 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  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_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -1266,4 +1400,3 @@
 m4_include([build/autotools/ltsugar.m4])
 m4_include([build/autotools/ltversion.m4])
 m4_include([build/autotools/lt~obsolete.m4])
-m4_include([build/autotools/shave.m4])
diff -Nru json-glib-0.7.6/build/autotools/libtool.m4 json-glib-0.10.2/build/autotools/libtool.m4
--- json-glib-0.7.6/build/autotools/libtool.m4	2009-08-12 16:07:25.000000000 +0100
+++ json-glib-0.10.2/build/autotools/libtool.m4	2010-02-26 14:04:22.000000000 +0000
@@ -2470,10 +2470,13 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2485,18 +2488,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3088,7 +3079,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3769,7 +3760,7 @@
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4194,9 +4185,6 @@
   cygwin* | mingw* | cegcc*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -4261,9 +4249,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4446,7 +4431,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -4621,7 +4606,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -4860,7 +4844,7 @@
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
diff -Nru json-glib-0.7.6/build/autotools/ltversion.m4 json-glib-0.10.2/build/autotools/ltversion.m4
--- json-glib-0.7.6/build/autotools/ltversion.m4	2009-08-12 16:07:25.000000000 +0100
+++ json-glib-0.10.2/build/autotools/ltversion.m4	2010-02-26 14:04:22.000000000 +0000
@@ -9,15 +9,15 @@
 
 # Generated from ltversion.in.
 
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru json-glib-0.7.6/build/autotools/Makefile.am json-glib-0.10.2/build/autotools/Makefile.am
--- json-glib-0.7.6/build/autotools/Makefile.am	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/build/autotools/Makefile.am	2010-02-26 13:56:30.000000000 +0000
@@ -1,10 +1,23 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST += \
+EXTRA_DIST = \
 	shave-libtool.in 	\
 	shave.in 		\
 	shave.m4 		\
 	as-compiler-flag.m4	\
-	introspection.m4
+	introspection.m4	\
+	Makefile.am.silent	\
+	Makefile.am.enums	\
+	Makefile.am.marshal	\
+	Makefile.am.gtest
 
 DISTCLEANFILES = shave-libtool shave
+
+# needed to avoid including Makefile.am.gtest
+test-report:
+	@true
+
+test:
+	@true
+
+check-local: test
+
+.PHONY: test test-report check-local
diff -Nru json-glib-0.7.6/build/autotools/Makefile.am.enums json-glib-0.10.2/build/autotools/Makefile.am.enums
--- json-glib-0.7.6/build/autotools/Makefile.am.enums	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/build/autotools/Makefile.am.enums	2009-11-28 14:40:46.000000000 +0000
@@ -0,0 +1,43 @@
+# Rules for generating enumeration types using glib-mkenums
+#
+# Define:
+# 	glib_enum_h = header template file
+# 	glib_enum_c = source template file
+# 	glib_enum_headers = list of headers to parse
+#
+# before including Makefile.am.enums. You will also need to have
+# the following targets already defined:
+#
+# 	CLEANFILES
+#	DISTCLEANFILES
+#	BUILT_SOURCES
+#	EXTRA_DIST
+#
+# Author: Emmanuele Bassi <ebassi@linux.intel.com>
+
+enum_tmpl_h=$(glib_enum_h:.h=.h.in)
+enum_tmpl_c=$(glib_enum_c:.c=.c.in)
+
+CLEANFILES += stamp-enum-types
+DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
+BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
+EXTRA_DIST += $(srcdir)/$(enum_tmpl_h) $(srcdir)/$(enum_tmpl_c)
+
+stamp-enum-types: $(glib_enum_headers) $(srcdir)/$(enum_tmpl_h)
+	$(QUIET_GEN)$(GLIB_MKENUMS) \
+		--template $(srcdir)/$(enum_tmpl_h) \
+	$(glib_enum_headers) > xgen-eh \
+	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
+	&& rm -f xgen-eh \
+	&& echo timestamp > $(@F)
+
+$(glib_enum_h): stamp-enum-types
+	@true
+
+$(glib_enum_c): $(glib_enum_h) $(srcdir)/$(enum_tmpl_c)
+	$(QUIET_GEN)$(GLIB_MKENUMS) \
+		--template $(srcdir)/$(enum_tmpl_c) \
+	$(glib_enum_headers) > xgen-ec \
+	&& cp -f xgen-ec $(glib_enum_c) \
+	&& rm -f xgen-ec
+
diff -Nru json-glib-0.7.6/build/autotools/Makefile.am.gtest json-glib-0.10.2/build/autotools/Makefile.am.gtest
--- json-glib-0.7.6/build/autotools/Makefile.am.gtest	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/build/autotools/Makefile.am.gtest	2010-02-26 13:56:30.000000000 +0000
@@ -0,0 +1,61 @@
+# JSON-GLib - JSON reader and writer library
+
+GTESTER        = gtester
+GTESTER_REPORT = gtester-report
+
+# initialize variables for unconditional += appending
+EXTRA_DIST =
+TEST_PROGS =
+
+### testing rules
+
+# test: run all tests in cwd and subdirs
+test:	${TEST_PROGS}
+	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
+	@ for subdir in $(SUBDIRS) . ; do \
+	    test "$$subdir" = "." -o "$$subdir" = "po" || \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+	  done
+# test-report: run tests in subdirs and generate report
+# perf-report: run tests in subdirs with -m perf and generate report
+# full-report: like test-report: with -m perf and -m slow
+test-report perf-report full-report:	${TEST_PROGS}
+	@test -z "${TEST_PROGS}" || { \
+	  case $@ in \
+	  test-report) test_options="-k";; \
+	  perf-report) test_options="-k -m=perf";; \
+	  full-report) test_options="-k -m=perf -m=slow";; \
+	  esac ; \
+	  if test -z "$$GTESTER_LOGDIR" ; then	\
+	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+	  elif test -n "${TEST_PROGS}" ; then \
+	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+	  fi ; \
+	}
+	@ ignore_logdir=true ; \
+	  if test -z "$$GTESTER_LOGDIR" ; then \
+	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
+	    ignore_logdir=false ; \
+	  fi ; \
+	  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 ; \
+	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
+	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
+	    done ; \
+	    echo >> $@.xml ; \
+	    echo '</report-collection>' >> $@.xml ; \
+	    rm -rf "$$GTESTER_LOGDIR"/ ; \
+	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
+	  }
+.PHONY: test test-report perf-report full-report
+# run make test as part of make check
+check-local: test
diff -Nru json-glib-0.7.6/build/autotools/Makefile.am.marshal json-glib-0.10.2/build/autotools/Makefile.am.marshal
--- json-glib-0.7.6/build/autotools/Makefile.am.marshal	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/build/autotools/Makefile.am.marshal	2009-11-28 14:40:50.000000000 +0000
@@ -0,0 +1,45 @@
+# Rules for generating marshal files using glib-genmarshal
+#
+# Define:
+# 	glib_marshal_list = marshal list file
+# 	glib_marshal_prefix = prefix for marshal functions
+#
+# before including Makefile.am.marshal. You will also need to have
+# the following targets already defined:
+#
+# 	CLEANFILES
+#	DISTCLEANFILES
+#	BUILT_SOURCES
+#	EXTRA_DIST
+#
+# Author: Emmanuele Bassi <ebassi@linux.intel.com>
+
+marshal_h = $(glib_marshal_list:.list=.h)
+marshal_c = $(glib_marshal_list:.list=.c)
+
+CLEANFILES += stamp-marshal
+DISTCLEANFILES += $(marshal_h) $(marshal_c)
+BUILT_SOURCES += $(marshal_h) $(marshal_c)
+EXTRA_DIST += $(srcdir)/$(glib_marshal_list)
+
+stamp-marshal: $(glib_marshal_list)
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
+		--prefix=$(glib_marshal_prefix) \
+		--header \
+	$(srcdir)/$(glib_marshal_list) > xgen-mh \
+	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
+	&& rm -f xgen-mh \
+	&& echo timestamp > $(@F)
+
+$(marshal_h): stamp-marshal
+	@true
+
+$(marshal_c): $(marshal_h)
+	$(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \
+	$(GLIB_GENMARSHAL) \
+		--prefix=$(glib_marshal_prefix) \
+		--body \
+	$(srcdir)/$(glib_marshal_list)) > xgen-mc \
+	&& cp xgen-mc $(marshal_c) \
+	&& rm -f xgen-mc
+
diff -Nru json-glib-0.7.6/build/autotools/Makefile.am.silent json-glib-0.10.2/build/autotools/Makefile.am.silent
--- json-glib-0.7.6/build/autotools/Makefile.am.silent	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/build/autotools/Makefile.am.silent	2009-10-29 14:37:07.000000000 +0000
@@ -0,0 +1,17 @@
+# custom rules for quiet builds
+
+if USE_SHAVE
+QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+QUIET_LN  = $(Q:@=@echo '  LN    '$@;)
+QUIET_RM  = $(Q:@=@echo '  RM    '$@;)
+else
+QUIET_GEN = $(AM_V_GEN)
+
+QUIET_LN   = $(QUIET_LN_$(V))
+QUIET_LN_  = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
+QUIET_LN_0 = @echo '  LN     '$@;
+
+QUIET_RM   = $(QUIET_RM_$(V))
+QUIET_RM_  = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
+QUIET_RM_0 = @echo '  RM     '$@;
+endif # USE_SHAVE
diff -Nru json-glib-0.7.6/build/autotools/Makefile.in json-glib-0.10.2/build/autotools/Makefile.in
--- json-glib-0.7.6/build/autotools/Makefile.in	2009-08-12 16:07:32.000000000 +0100
+++ json-glib-0.10.2/build/autotools/Makefile.in	2010-02-26 14:04:29.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -13,12 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-# JSON-GLib - JSON reader and writer library
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -33,10 +33,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/shave-libtool.in $(srcdir)/shave.in \
-	$(top_srcdir)/Makefile.decl
 subdir = build/autotools
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
@@ -47,19 +45,25 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = shave-libtool shave
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -70,7 +74,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -81,8 +84,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -110,6 +111,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -119,12 +121,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -137,13 +138,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -191,25 +190,28 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-GTESTER = gtester
-GTESTER_REPORT = gtester-report
+EXTRA_DIST = \
+	shave-libtool.in 	\
+	shave.in 		\
+	shave.m4 		\
+	as-compiler-flag.m4	\
+	introspection.m4	\
+	Makefile.am.silent	\
+	Makefile.am.enums	\
+	Makefile.am.marshal	\
+	Makefile.am.gtest
 
-# initialize variables for unconditional += appending
-EXTRA_DIST = shave-libtool.in shave.in shave.m4 as-compiler-flag.m4 \
-	introspection.m4
-TEST_PROGS = 
 DISTCLEANFILES = shave-libtool shave
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -218,9 +220,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  build/autotools/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  build/autotools/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/autotools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu build/autotools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -238,10 +240,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-shave-libtool: $(top_builddir)/config.status $(srcdir)/shave-libtool.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-shave: $(top_builddir)/config.status $(srcdir)/shave.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -271,13 +270,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -306,6 +309,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -325,6 +329,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -333,18 +339,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -365,7 +381,7 @@
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.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 \
@@ -380,58 +396,17 @@
 	uninstall uninstall-am
 
 
-### testing rules
+# needed to avoid including Makefile.am.gtest
+test-report:
+	@true
+
+test:
+	@true
 
-# test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-	@ for subdir in $(SUBDIRS) . ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then	\
-	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	  elif test -n "${TEST_PROGS}" ; then \
-	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	  fi ; \
-	}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  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 ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
 check-local: test
+
+.PHONY: test test-report check-local
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/build/Makefile.am json-glib-0.10.2/build/Makefile.am
--- json-glib-0.7.6/build/Makefile.am	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/build/Makefile.am	2009-10-29 14:37:07.000000000 +0000
@@ -1,3 +1,11 @@
-include $(top_srcdir)/Makefile.decl
-
 SUBDIRS = autotools
+
+test-report:
+	@true
+
+test:
+	@true
+
+check-local: test
+
+.PHONY: test-report test check-local
diff -Nru json-glib-0.7.6/build/Makefile.in json-glib-0.10.2/build/Makefile.in
--- json-glib-0.7.6/build/Makefile.in	2009-08-12 16:07:32.000000000 +0100
+++ json-glib-0.10.2/build/Makefile.in	2010-02-26 14:04:29.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -13,12 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-# JSON-GLib - JSON reader and writer library
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -33,9 +33,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.decl
 subdir = build
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
@@ -46,13 +45,19 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -64,13 +69,41 @@
 	ps-recursive uninstall-recursive
 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
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -81,7 +114,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -92,8 +124,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -121,6 +151,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -130,12 +161,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -148,13 +178,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -202,24 +230,17 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-GTESTER = gtester
-GTESTER_REPORT = gtester-report
-
-# initialize variables for unconditional += appending
-EXTRA_DIST = 
-TEST_PROGS = 
 SUBDIRS = autotools
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -228,9 +249,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  build/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  build/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu build/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -248,6 +269,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -262,7 +284,7 @@
 #     (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):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -279,7 +301,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -287,7 +309,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -313,16 +335,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -337,7 +359,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -349,7 +371,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -358,29 +380,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	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; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -401,29 +428,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -454,6 +496,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -472,6 +515,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -480,18 +525,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -512,8 +567,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.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 \
@@ -530,58 +585,16 @@
 	tags tags-recursive uninstall uninstall-am
 
 
-### testing rules
+test-report:
+	@true
+
+test:
+	@true
 
-# test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-	@ for subdir in $(SUBDIRS) . ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then	\
-	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	  elif test -n "${TEST_PROGS}" ; then \
-	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	  fi ; \
-	}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  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 ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
 check-local: test
+
+.PHONY: test-report test check-local
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/ChangeLog json-glib-0.10.2/ChangeLog
--- json-glib-0.7.6/ChangeLog	2009-08-12 16:08:14.000000000 +0100
+++ json-glib-0.10.2/ChangeLog	2010-02-26 14:05:48.000000000 +0000
@@ -1,3 +1,1063 @@
+commit 755592e2c9e7e9cafbdf2b349a0df41dfeae83aa
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Fri Feb 26 14:04:12 2010 +0000
+
+    Release 0.10.2 (stable snapshot)
+
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 382159118096b899b10411c8b37dbc743702e205
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Fri Feb 26 14:03:59 2010 +0000
+
+    Update NEWS file
+
+ NEWS |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit a5d9c7bd125571c877f1f7b76f92412b37fc4ce4
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Jan 24 18:58:28 2010 +0000
+
+    docs: Fix the GBoxed registration example
+    
+    The registration function for serialization and deserialization has been
+    replaced by two separate functions before releasing 0.10, but I forgot to
+    update the example in the documentation.
+    (cherry picked from commit ea666891cb1e6fc9e527ce6c93a306bc97145f16)
+
+ json-glib/json-gboxed.c |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 1ce1d549477b79e7d94fb891f323afbdb8a8d4ce
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Jan 10 09:59:14 2010 +0000
+
+    Initialize every member of JsonObject on construction
+    
+    We create JsonObject structures using g_slice_new(), so we need to
+    initialize every member of the structure ourselves.
+    (cherry picked from commit c09c2dc1c54c83fea4ef93486081fe3fab35452c)
+
+ json-glib/json-object.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit dae32677d140a3ba6a15e1198b53ea0b3e1716b0
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Dec 29 15:35:21 2009 +0000
+
+    Post-release version bump to 0.10.1
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5aff66e8fae3e28c9cb6b74696170154eed303a7
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Dec 29 15:33:28 2009 +0000
+
+    Release 0.10.0
+
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7258a776ea90ea4b2dcc6f1e4e440bb09c581a12
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Dec 29 15:31:22 2009 +0000
+
+    build: Enable introspection when distchecking
+
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 80c5178127052e600146ca889500e263da4ebf10
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Sun Dec 27 02:09:44 2009 +0100
+
+    Initialize out variables before using them
+    
+    Here's a small patch for json-glib, to fix some gcc warnings breaking
+    the build with -Werror (gcc can't know if the variable will get
+    initialized or not). I didn't find a product for json-glib in bugzilla,
+    but I guess a mail will work ;-)
+    
+    Happy holidays :-)
+    
+    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
+
+ json-glib/json-gobject.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e3a57eae397926ad23e216996eda164ed6c15c63
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:50:58 2009 +0000
+
+    Post-release bump to 0.9.3
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4477758b73a0712fdef5e7907f6b6f4e0878428e
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:34:41 2009 +0000
+
+    Release 0.9.2 (0.10.0-rc1)
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 654f99c6b0d771cc6b4c68790ab164b0f691307d
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:34:08 2009 +0000
+
+    Update NEWS
+
+ NEWS |   15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 307605046cf89ef922d1d1e7c7b95405f3ecfdfb
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:48:25 2009 +0000
+
+    docs: Fix annotation for json_gobject_to_data()
+
+ json-glib/json-gobject.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e7eb3ca4a9de1c7348dc82f528cf0858f52849dd
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:37:04 2009 +0000
+
+    docs: Add missing to/from_data methods
+
+ doc/reference/json-glib-sections.txt |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 27bb2c060a7b2ecc4839719d39b2044efe4c3e7a
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:46:27 2009 +0000
+
+    docs: Add release notes to the README
+
+ README |   12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 780d82310c47c3f07bcbaab2cefbea0d6decb899
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:33:45 2009 +0000
+
+    docs: Update the README
+
+ README |   27 ++++++++++++++++-----------
+ 1 files changed, 16 insertions(+), 11 deletions(-)
+
+commit d122f9b8c09ad7e82b1a70da5d65ebba2111e6cc
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:33:01 2009 +0000
+
+    build: Clean up the configure summary
+    
+    Make the output of the summary a little bit nicer.
+
+ configure.ac |   27 ++++++++++++++++++++-------
+ 1 files changed, 20 insertions(+), 7 deletions(-)
+
+commit e4c4480036a82cc5177fc1f184c18019af0e805e
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sun Nov 29 12:31:54 2009 +0000
+
+    build: Require G-I 0.6.4
+    
+    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 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4445bdb04d5eebc145a1db82aa5b811e8d4ed048
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sat Nov 28 19:13:27 2009 +0000
+
+    docs: Fix argument name mismatch
+    
+    gtk-doc complains that the argument name in the header does not match
+    the one in the documentation annotation for the GBoxed deserialization
+    function registration.
+
+ json-glib/json-gobject.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 793e827feaa9be3c4ffbe5c0425ac6bcc0c9e6d1
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sat Nov 28 19:06:36 2009 +0000
+
+    build: Clean up json-glib/Makefile.am rules
+
+ json-glib/Makefile.am |   24 ++++--------------------
+ 1 files changed, 4 insertions(+), 20 deletions(-)
+
+commit 97584658672fe4709fc7c3b24a44b477112322f7
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Sat Nov 28 17:39:37 2009 +0000
+
+    build: Fix out-of-tree enum types file generation
+
+ build/autotools/Makefile.am.enums |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3cf919e9c7f3201305a1a63a3c270e422a37efed
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Mon Nov 23 22:20:58 2009 +0000
+
+    boxed: Split (de)serialization registration
+    
+    A GBoxed type defined as:
+    
+      struct Boxed {
+        int foo;
+        gboolean bar;
+        int baz;
+      };
+    
+    Can be represented either by a JSON object:
+    
+      {
+        "foo" : 1,
+        "bar" : true,
+        "baz" : 3
+      }
+    
+    Or by a JSON array:
+    
+      [ 1, true, 3 ]
+    
+    The current function for registering a serialization and a
+    deserialization pair does not allow registering more than one
+    deserialization function - which means that there can only be
+    one way to deserialize a GBoxed type into a specific JsonNode
+    type.
+    
+    To allow having more than one JsonNodeType associated to a
+    GBoxed type and a deserialization function we need to split out
+    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 +-
+ 5 files changed, 114 insertions(+), 78 deletions(-)
+
+commit 61d54cc9e2a3098e876e700a9248428f400a5368
+Author: Tristan Van Berkom <tristan.van.berkom@gmail.com>
+Date:   Thu Nov 12 12:59:03 2009 +0000
+
+    serializable: Make Serializable in charge of parsing
+    
+    If a GObject class implements JsonSerializable and has overridden
+    the serialize_property() vfunc then the Serializable should be fully in
+    charge of serializing a property - that is: JSON-GLib should not try to
+    add a fallback in case the serialize_property() implementation returned
+    NULL.
+    
+    This is a change in semantics for JsonSerializable implementations.
+    
+    http://bugzilla.openedhand.com/show_bug.cgi?id=1859
+    
+    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
+
+ json-glib/json-gobject.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 63dc03da507a216c0764bc0e50fc62b2b77dc1b2
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 12:38:29 2009 +0000
+
+    serializable: Add methods proxying default implementations
+    
+    If you want to use the default implementation of serialize_property()
+    and/or deserialize_property() from an object class implementing
+    JsonSerializable you currently have to peek the interface vtable and
+    then call the vfunc pointers.
+    
+    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 ++++++++++++++++++++++++++++++++++
+ 3 files changed, 115 insertions(+), 9 deletions(-)
+
+commit 5f484d8c274a2b866f9a3d38eebe2baa1939b7ac
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 12:03:13 2009 +0000
+
+    gobject: Add deprecation annotations
+    
+    This makes it easier to detect when building without
+    JSON_DISABLE_DEPRECATED.
+
+ json-glib/json-gobject.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3c7811bf24d4b957da730949af6795b728db5bad
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 12:02:41 2009 +0000
+
+    build: Build without deprecations
+    
+    Make sure that JSON-GLib is built without using deprecated API.
+
+ json-glib/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 923311ee52b77f53c5c529e497ea2a24efaf23ea
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 12:01:04 2009 +0000
+
+    tests: Do not use deprecated API
+    
+    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 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+commit e3ae84e743e1d1a1a0202e900f443e143cb77f45
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 11:57:45 2009 +0000
+
+    tests: Verify Serializable::serialize_property()
+    
+    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 ++++++++++++++++++++++++++++++++
+ 1 files changed, 32 insertions(+), 0 deletions(-)
+
+commit 7cebdd008a02e6cef0514f40327f94eba2a2088e
+Author: Cornelius Hald <hald@icandy.de>
+Date:   Thu Nov 12 11:37:54 2009 +0000
+
+    Doubles are converted to strings containing commas
+    
+    Under some locales (e.g. de_DE) a double is converted to a string
+    containing a comma instead of a dot. That breaks the JSON syntax.
+    
+    Example:
+    Double: 0.34 is converted to 0,34 when using locale de_DE
+    
+    http://bugzilla.openedhand.com/show_bug.cgi?id=1826
+    
+    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
+
+ json-glib/json-generator.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 30d4efb775cb416212c00e3ececb0f0147739f40
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 11:28:17 2009 +0000
+
+    Update Introspection annotations
+    
+    • Fix the transfer rules for JsonNode, JsonObject and JsonArray
+    getters.
+    
+    • 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 +++--
+ 4 files changed, 33 insertions(+), 30 deletions(-)
+
+commit 47cd2f678a8321faac0e2d00a3538181e7bc1cbf
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 11:27:36 2009 +0000
+
+    build: Add more flags to the maintainer cflags list
+
+ configure.ac |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit ecc185d1c542f6ff41f84be026dc380f611a5d6e
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Nov 12 10:09:17 2009 +0000
+
+    enum-types: Put back a missing static
+    
+    The GEnumValue array defining the enumeration type values must be
+    static, otherwise everything will crash when trying to retrieve the
+    enumeration data from the GEnumClass.
+
+ json-glib/json-enum-types.c.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 84f5af58c23b174cc9708e81ce8ccbfffa6e68eb
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Fri Oct 30 10:46:32 2009 +0000
+
+    object: Return values list in insertion order
+    
+    Since we return the member names in insertion order, we should also
+    return the member values in the same order.
+    
+    This also allows us to get rid of the (yucky) internal copies of
+    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 ++++++-----------------------------------------
+ 1 files changed, 7 insertions(+), 48 deletions(-)
+
+commit a25a1ded25e5d1f605cffd6da7a5e036151aa70c
+Author: Mathias Hasselmann <mathias.hasselmann@gmx.de>
+Date:   Thu Oct 29 14:01:04 2009 +0000
+
+    tests: Verify parsing bare values
+    
+    http://bugzilla.openedhand.com/show_bug.cgi?id=1856
+    
+    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
+
+ tests/test-parser.c |   38 +++++++++++++++++++++++++++++++++-----
+ 1 files changed, 33 insertions(+), 5 deletions(-)
+
+commit 026ea0357fbe95e2acd43555e3b5d00e329c9740
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Thu Oct 29 13:59:44 2009 +0000
+
+    parser: Advance when parsing bare values
+    
+    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 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 578111be53065a2bbeda73865bfa4e178f185649
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Wed Oct 28 16:54:34 2009 +0000
+
+    introspection: Fix the GIR generation
+    
+    The rule for creating the JSON-GLib GIR file should use the
+    json-glib.la shared object, to avoid using the installed
+    copy of JSON-GLib when compiling the typelib.
+    
+    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 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+commit 8f8ce87730fc0bf102a707e84c4f6106b215cfab
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Wed Oct 28 16:23:39 2009 +0000
+
+    gobject: Use from/to data naming convention
+    
+    Be more GLib-like, and use
+    
+      <namespace>_<type>_from_data()
+      <namespace>_<type>_to_data()
+    
+    Instead of the homebrew "construct" and "serialize", when dealing
+    with string buffers.
+    
+    This means:
+    
+      • adding json_gobject_from_data() to deprecate
+        json_construct_gobject()
+      • adding json_gobject_to_data() to deprecate
+        json_serialize_gobject()
+    
+    The json_construct_gobject() function also contains a mistake: it
+    uses gsize with the special value of -1 meaning "slurp the whole
+    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 +++++++
+ 2 files changed, 69 insertions(+), 4 deletions(-)
+
+commit 00b4d200849e232cd904d23d3593d6f95252b483
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Wed Oct 28 16:05:19 2009 +0000
+
+    gobject: Uniform JSON<->GObject mapping code
+    
+    Rename json_gobject_new() to json_gobject_deserialize(), and
+    json_gobject_dump() to json_gobject_serialize(); this maps the
+    JSON GBoxed API.
+    
+    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 ++--
+ 3 files changed, 61 insertions(+), 35 deletions(-)
+
+commit fc0607c740b153acc96e4df12a12b042e08e831b
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Wed Oct 28 12:01:21 2009 +0000
+
+    docs: Add long descriptions
+    
+    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 +++-
+ 2 files changed, 49 insertions(+), 5 deletions(-)
+
+commit 498827110f3d635e545c7351732551676a06a1bf
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Wed Oct 28 10:07:39 2009 +0000
+
+    docs: Add the 0.10 symbols index
+
+ doc/reference/json-glib-docs.xml |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 0979bbceb654c5e4b5dadf1e6f7e85bb9df87ca5
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 20:58:08 2009 +0000
+
+    docs: Split out GObject-related sections
+    
+    Like commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2 did for the
+    source code, the documentation should be split three-ways:
+    
+      • GObject-related API
+      • JsonSerializable
+      • GBoxed-related API
+
+ 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
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 20:57:52 2009 +0000
+
+    docs: Documentation fixes for gtk-doc
+
+ json-glib/json-gboxed.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 20:49:09 2009 +0000
+
+    build: Split out GBoxed and Serializable
+    
+    The json-gobject.c is getting pretty crowded; we should split out
+    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 ++++++++++++++++
+ 5 files changed, 476 insertions(+), 367 deletions(-)
+
+commit 373fa3d9b73391b38620fbd9ce9b69f358e5f4c8
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 18:10:19 2009 +0000
+
+    gobject: Make GObject<->JsonObject functions public
+    
+    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 ++++++++++------
+ 2 files changed, 38 insertions(+), 8 deletions(-)
+
+commit 85f7a8e8206168d95b3ef9c02aa584f0fae5b37e
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 18:03:11 2009 +0000
+
+    gobject: Reuse the list data
+    
+    Since we ignore all members that don't have a corresponding
+    GParamSpec for the class we cannot use:
+    
+      members = g_list_prepend (members, pspec->name);
+    
+    Because pspec might also be NULL. We can reuse the GList iterator
+    data field, since that points to data internal to the JsonObject
+    we are iterating over.
+
+ json-glib/json-gobject.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ff986ee5b8df45255f4f5ab01be0bbad893bc55e
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 17:53:34 2009 +0000
+
+    gobject: Add experimental GBoxed<->JSON transformation
+    
+    Serializing and deserializing GBoxed types is fairly complicated
+    currently. If a GObject implements JsonSerializable it is possible
+    for the class to intercept the JsonNode, parse it manually and
+    then set the value to the property.
+    
+    This leaves a hole opened for:
+    
+      • manual (de)serialization of GBoxed types
+      • (de)serialization of GBoxed properties in classes not
+        implementing JsonSerializable
+    
+    In order to serialize and deserialize a GBoxed JSON-GLib should
+    provide a mechanism similar to the GValue transformation functions:
+    when registering the boxed type the developer should also be able
+    to register a serialization and a deserialization functions pair
+    matching the tuple:
+    
+      (GBoxed type, JSON type)
+    
+    The serialization function would be:
+    
+      JsonNode *(* JsonBoxedSerializeFunc) (gconstpointer boxed);
+    
+    And, conversely, the deserialization function would be:
+    
+      gpointer (* JsonBoxedDeserializeFunc) (JsonNode *node);
+    
+    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 +++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 602 insertions(+), 38 deletions(-)
+
+commit 7f6a73a0964b66b15e8b5a9858b9bc76b010f67b
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 17:43:38 2009 +0000
+
+    node: Add a private NodeType-to-string converter
+    
+    Useful for debugging and logging purposes.
+
+ json-glib/json-node.c          |   23 ++++++++++++++++++++++-
+ json-glib/json-types-private.h |    2 ++
+ 2 files changed, 24 insertions(+), 1 deletions(-)
+
+commit 3f8990f7a4c362590f19e427aae2f68f27303fe6
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 17:42:14 2009 +0000
+
+    Remove a stray ';' that broke deserializing GStrv
+    
+    The stray semicolon was preventing the GPtrArray from being
+    updated.
+
+ json-glib/json-gobject.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8e550ac4dbb5500a40c7adad88868ede40397db7
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 17:41:38 2009 +0000
+
+    Fix compiler warnings (remove unused variables)
+
+ json-glib/json-gobject.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 3b994a52d9c34f67e4ac52aa4bb0c380789fbd60
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 17:40:55 2009 +0000
+
+    build: Export MAINTAINER_CFLAGS
+    
+    Apparently, the MAINTAINER_CFLAGS were ignored.
+
+ configure.ac |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0810711a7fbb915ba9397a66e77babb30765d090
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 17:40:23 2009 +0000
+
+    build: Use AM_PROG_CC_C_O
+    
+    Use the Automake macro to enable per-target compiler flags.
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d664f886372afbe1d54e633240e7b7e06ebc45c8
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 17:40:03 2009 +0000
+
+    Fix compiler warnings (remove unused variables)
+
+ tests/test-generator.c      |    4 ++--
+ tests/test-serialize-full.c |    1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 83dea3b3dd2281dca206e0873b5fed0a2a3d50de
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 14:01:24 2009 +0000
+
+    gobject: Support constructor properties
+    
+    The GObject deserialization code currently skips all the constructor
+    and constructor-only properties. In order to implement them we can
+    add a preliminary pass on the JSON object members and build a
+    GParameter array.
+    
+    As we don't have a GObject instance we cannot really use the
+    Serializable interface to provide custom parsing for complex data
+    structures, thus we fall back to the default deserialization code
+    path.
+
+ json-glib/json-gobject.c    |   98 ++++++++++++++++++++++++++++++++++++++-----
+ tests/test-serialize-full.c |   11 +++--
+ 2 files changed, 93 insertions(+), 16 deletions(-)
+
+commit 2616938c7c042fced9be197205a535a8b420534e
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 11:57:38 2009 +0000
+
+    build: Clean up the build environment
+    
+    Some of the rules can be moved into their own files to be included
+    when needed, like:
+    
+      • silent rules (QUIET_*)
+      • glib-mkenums rules
+      • glib-genmarshal rules
+    
+    Also, the test suite rules should be moved from the top-level of
+    the project into the build/autotools directory and then included
+    only where it makes sense.
+    
+    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 ++----
+ 14 files changed, 252 insertions(+), 149 deletions(-)
+
+commit 5406301b0e3bf74c0d7ae47a618c416d5c6dc29d
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 11:30:55 2009 +0000
+
+    gobject: Serialize properties holding a GObject
+    
+    Like we deserialize them, we can serialize GObject properties
+    defined using GParamSpecObject.
+
+ json-glib/json-gobject.c |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 3a2176ebf96b33716d1b50068ca44b1d3cd9b0c8
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 11:29:32 2009 +0000
+
+    tests: Use properties to change values
+    
+    The values inside _init() should match the default values of the
+    properties as specified by the GParamSpec. If we want to verify
+    a non-default value we should specify the value when instantiating
+    the object.
+
+ tests/test-serialize-simple.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1ff48cdc5d773925bda1ddf8bc904a9ea6a5e643
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 11:18:51 2009 +0000
+
+    gobject: Split GObject serialization code
+    
+    Like for the deserialization of a GObject into a JsonObject we
+    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 +++++++++++++++++++++++++---------------------
+ 1 files changed, 61 insertions(+), 52 deletions(-)
+
+commit 27afed8dc89bf9562c3536f0a053d250e70eea4d
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 10:30:27 2009 +0000
+
+    gobject: Recurse in GParamSpecObject properties
+    
+    Use the newly added json_gobject_new() internal function to
+    recurse into properties defined using GParamSpecObject.
+    
+    The same rules used by json_construct_gobject() apply to the
+    properties storing a GObject - including JsonSerializable
+    support.
+    
+    The test case for serialization and deserialization of a
+    GObject has been updated to include a property holding a
+    GObject.
+
+ json-glib/json-gobject.c    |   14 +++++++++-
+ tests/test-serialize-full.c |   58 +++++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 64 insertions(+), 8 deletions(-)
+
+commit 317447b52455c56b0123168ab127ce026d7d0c22
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Tue Oct 27 10:20:42 2009 +0000
+
+    gobject: Split JSON to GObject code
+    
+    If we want to be able to parse a GParamSpecObject property
+    we need to use the same code as json_construct_gobject(), minus
+    the parsing.
+
+ json-glib/json-gobject.c |  152 +++++++++++++++++++++++++---------------------
+ 1 files changed, 83 insertions(+), 69 deletions(-)
+
+commit cba7db96581343e3cbd8e5eb067026efb8cac24e
+Author: Emmanuele Bassi <ebassi@linux.intel.com>
+Date:   Mon Oct 26 22:36:01 2009 +0000
+
+    object: Guarantee insertion order
+    
+    When iterating over the members of a JsonObject, or when retrieving
+    the list of members, the insertion order should be preserved by the
+    JsonObject. This is simply implemented by keeping a mirror list of
+    the member names.
+    
+    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 +-
+ 3 files changed, 40 insertions(+), 33 deletions(-)
+
+commit d5bebce0286aef5c4b4110c16c22a8ef3dc38405
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Sep 28 18:15:48 2009 +0100
+
+    [node] Add HOLDS macros for quick type checking
+    
+    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 +-
+ 3 files changed, 58 insertions(+), 2 deletions(-)
+
+commit 17fc731ed54b754285bac76c7ac23eac6b96bf24
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Sep 28 14:02:14 2009 +0100
+
+    [tests] Add a test case for Object members with empty strings
+    
+    Both the Object API and the Parser should not choke on members with
+    empty strings as their value. The Object should just have a member
+    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 +
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 5181bf24bf3cde743de590ab3ffa0471df9e4799
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Sep 22 15:42:34 2009 +0100
+
+    Post-branch bump to 0.9.1
+
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3f83767109979c660469b3b5862fbd04469a8011
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Sep 22 15:39:46 2009 +0100
+
+    [release] 0.8.0
+
+ NEWS         |    2 ++
+ configure.ac |    8 ++++++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+commit bd604338b25884edbd86cf531505259948484323
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Sep 22 15:34:18 2009 +0100
+
+    [parser] Return the right expected token
+    
+    When parsing a value embedded in a Json Object or Array we need to
+    return the right expected token so that the generated syntax error
+    will be correct.
+
+ json-glib/json-parser.c |   16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+commit f99cf3d3d038eff786f85409f3d04736e2068e74
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Tue Sep 22 15:34:07 2009 +0100
+
+    [parser] Whitespace clean up
+
+ json-glib/json-parser.c |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 6c20aae2b49a6d64db5e7d1ff3a82950ea9dc58a
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Mon Sep 7 22:30:11 2009 +0100
+
+    [build] Prefer automake-1.11 silent rules to shave
+    
+    If we have automake-1.11 installed then we should enable the
+    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 +++++-
+ 3 files changed, 22 insertions(+), 6 deletions(-)
+
+commit 7b4bb80930f12a366d5e5a5eea5b398972cd4891
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sun Sep 6 17:31:41 2009 +0100
+
+    [node] Add JsonNode.set_parent()
+    
+    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 ++++++++++
+ 5 files changed, 38 insertions(+), 7 deletions(-)
+
+commit c1b76a73e0b2c6e0c7afced10bd6079a0f5b0f5d
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sun Sep 6 17:15:46 2009 +0100
+
+    [parser] Clean up value parsing
+    
+    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 +-
+ 2 files changed, 86 insertions(+), 122 deletions(-)
+
+commit d3f005c27d9a8a46259205f2f8077fb01a6a3609
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sun Sep 6 14:44:18 2009 +0100
+
+    [docs] Use proper xi:include for indexes
+    
+    Instead of relying on gtk-doc we can do the proper inclusion of the
+    API indexes using XInclude, complete with fallbacks.
+    
+    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 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 7442a3011a860f12cbd40b6687b699b0b648d6b7
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Wed Sep 2 16:41:51 2009 +0100
+
+    [docs] Small documentation fixes
+    
+    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 ++-
+ 3 files changed, 20 insertions(+), 18 deletions(-)
+
+commit d7d1e702b1d67fa1ec830a46650a02367ce1dd29
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Sun Aug 16 05:52:46 2009 +0100
+
+    [docs] Remove note about normalization of member names
+    
+    The normalization of member names inside JsonObject was removed by
+    commit 8a7e0f381dc7e49745680df92ebb428f18bf4832.
+
+ json-glib/json-object.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+commit 9362ccc891c914dbcf1be6bd067b0b37ae688057
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Thu Aug 13 15:10:27 2009 +0100
+
+    [docs] Generate new symbols index for 0.6 and 0.8
+
+ doc/reference/json-glib-docs.xml |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 087bfe83412dca8de1b2dd67c74f490e44ecb96a
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Thu Aug 13 15:10:07 2009 +0100
+
+    [docs] Remove the version number from the title
+
+ doc/reference/json-glib-docs.xml |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+commit c7d31d55b50b23c6c1067cb3541f73dddc12127a
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Thu Aug 13 15:08:56 2009 +0100
+
+    [docs] Let gtk-doc build the correct index
+    
+    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 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be07ba7b983b34231ad2f0fd7fe60ae47b14ce7e
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Thu Aug 13 14:51:42 2009 +0100
+
+    [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 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 182 insertions(+), 180 deletions(-)
+
+commit 9661ff342b439b5b398f7bf9ba931d6139d5143d
+Author: Emmanuele Bassi <ebassi@gnome.org>
+Date:   Wed Aug 12 16:09:33 2009 +0100
+
+    Post-release version bump to 0.7.7
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
 commit d5922b42604c09ba7ebcb0adc1566d0a33a99808
 Author: Emmanuele Bassi <ebassi@gnome.org>
 Date:   Wed Aug 12 16:06:40 2009 +0100
diff -Nru json-glib-0.7.6/compile json-glib-0.10.2/compile
--- json-glib-0.7.6/compile	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/compile	2010-02-26 14:04:29.000000000 +0000
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2009-10-06.20; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# 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>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# 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:
diff -Nru json-glib-0.7.6/config.guess json-glib-0.10.2/config.guess
--- json-glib-0.7.6/config.guess	2009-08-12 16:07:32.000000000 +0100
+++ json-glib-0.10.2/config.guess	2010-02-26 14:04:29.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # 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
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-11-20'
 
 # 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
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # 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.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# 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
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -170,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -333,6 +333,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -656,7 +659,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -807,12 +810,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +825,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +857,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +893,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -882,78 +913,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +949,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +976,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1004,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1112,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1205,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff -Nru json-glib-0.7.6/config.h.in json-glib-0.10.2/config.h.in
--- json-glib-0.7.6/config.h.in	2009-08-12 16:07:31.000000000 +0100
+++ json-glib-0.10.2/config.h.in	2010-02-26 14:04:27.000000000 +0000
@@ -44,6 +44,9 @@
    */
 #undef LT_OBJDIR
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
diff -Nru json-glib-0.7.6/config.sub json-glib-0.10.2/config.sub
--- json-glib-0.7.6/config.sub	2009-08-12 16:07:32.000000000 +0100
+++ json-glib-0.10.2/config.sub	2010-02-26 14:04:29.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -149,10 +152,13 @@
 	-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)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -281,6 +287,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -288,13 +295,14 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -337,7 +345,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -365,7 +373,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -374,6 +382,7 @@
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +476,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -719,6 +732,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1240,6 +1256,9 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1279,9 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1302,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1613,7 +1632,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff -Nru json-glib-0.7.6/configure json-glib-0.10.2/configure
--- json-glib-0.7.6/configure	2009-08-12 16:07:31.000000000 +0100
+++ json-glib-0.10.2/configure	2010-02-26 14:04:27.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for json-glib 0.7.6.
+# Generated by GNU Autoconf 2.63 for json-glib 0.10.2.
 #
 # Report bugs to <http://bugzilla.openedhand.com/enter_bug.cgi?product=json-glib>.
 #
@@ -745,8 +745,8 @@
 # Identity of this package.
 PACKAGE_NAME='json-glib'
 PACKAGE_TARNAME='json-glib'
-PACKAGE_VERSION='0.7.6'
-PACKAGE_STRING='json-glib 0.7.6'
+PACKAGE_VERSION='0.10.2'
+PACKAGE_STRING='json-glib 0.10.2'
 PACKAGE_BUGREPORT='http://bugzilla.openedhand.com/enter_bug.cgi?product=json-glib'
 
 ac_unique_file="json-glib/json-glib.h"
@@ -786,16 +786,13 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
-Q
-V
-OBJC
-F77
-FC
-CXX
-AM_MAKEFLAGS
-MAKEFLAGS
-shavedir
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+USE_SHAVE_FALSE
+USE_SHAVE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
 HAVE_INTROSPECTION_FALSE
 HAVE_INTROSPECTION_TRUE
 INTROSPECTION_TYPELIBDIR
@@ -809,6 +806,7 @@
 ENABLE_GTK_DOC_TRUE
 GTKDOC_CHECK
 HTML_DIR
+MAINTAINER_CFLAGS
 JSON_DEBUG_CFLAGS
 ENABLE_GLIB_TEST_FALSE
 ENABLE_GLIB_TEST_TRUE
@@ -817,6 +815,7 @@
 GLIB_PREFIX
 LIBOBJS
 JSON_LT_LDFLAGS
+JSON_RELEASE_STATUS
 JSON_VERSION
 JSON_MINOR_VERSION
 JSON_MICRO_VERSION
@@ -947,7 +946,7 @@
 with_html_dir
 enable_gtk_doc
 enable_introspection
-enable_shave
+enable_silent_rules
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1513,7 +1512,7 @@
   # 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.7.6 to adapt to many kinds of systems.
+\`configure' configures json-glib 0.10.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1583,7 +1582,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of json-glib 0.7.6:";;
+     short | recursive ) echo "Configuration of json-glib 0.10.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1607,7 +1606,8 @@
   --enable-gtk-doc        use gtk-doc to build documentation [default=no]
   --enable-introspection=[no/auto/yes]
                           Enable introspection for this build
-  --enable-shave          use shave to make the build pretty [default=yes]
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1696,7 +1696,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-json-glib configure 0.7.6
+json-glib configure 0.10.2
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1710,7 +1710,7 @@
 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.7.6, which was
+It was created by json-glib $as_me 0.10.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2082,7 +2082,7 @@
 
 
 
-am__api_version='1.10'
+am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2213,16 +2213,33 @@
 # 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='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+
 # 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`
+   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`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2266,7 +2283,14 @@
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -2276,6 +2300,115 @@
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# 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.
+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.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  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
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  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
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
 { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
@@ -2430,7 +2563,7 @@
 
 # Define the identity of the package.
  PACKAGE='json-glib'
- VERSION='0.7.6'
+ VERSION='0.10.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2458,108 +2591,6 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# 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.
-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.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.
@@ -2614,7 +2645,7 @@
 am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -2625,24 +2656,24 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# 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
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 
 
@@ -3631,6 +3662,11 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -3648,7 +3684,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # 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
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -3658,19 +3704,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # 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__minus_obj=
+      ;;
     none) break ;;
     esac
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -4120,21 +4170,153 @@
 
   rm -f conf.glibtest
 
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6'
-macro_revision='1.3012'
-
-
-
-
-
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6b'
+macro_revision='1.3017'
+
+
+
+
+
 
 
 
@@ -4822,13 +5004,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4825: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5007: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4828: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5010: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4831: output\"" >&5)
+  (eval echo "\"\$as_me:5013: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5298,7 +5480,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -6033,7 +6215,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6036 "configure"' > conftest.$ac_ext
+  echo '#line 6218 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7860,11 +8042,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7863: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8045: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7867: \$? = $ac_status" >&5
+   echo "$as_me:8049: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8199,11 +8381,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8202: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8384: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8206: \$? = $ac_status" >&5
+   echo "$as_me:8388: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8304,11 +8486,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8307: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8489: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8311: \$? = $ac_status" >&5
+   echo "$as_me:8493: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8359,11 +8541,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8362: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8544: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8366: \$? = $ac_status" >&5
+   echo "$as_me:8548: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8478,9 +8660,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
-    link_all_deplibs=no
-    ;;
   esac
 
   ld_shlibs=yes
@@ -8663,7 +8842,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -8838,7 +9017,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9253,7 +9431,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10215,10 +10393,13 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10230,18 +10411,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11175,7 +11344,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11178 "configure"
+#line 11347 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11271,7 +11440,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11274 "configure"
+#line 11443 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11445,868 +11614,79 @@
   aix3*)
     test "$enable_shared" = yes && enable_static=no
     if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-JSON_MAJOR_VERSION=0
-JSON_MINOR_VERSION=7
-JSON_MICRO_VERSION=6
-JSON_VERSION=0.7.6
-
-
-
-
-
-JSON_LT_CURRENT=706
-JSON_LT_REVISION=0
-JSON_LT_AGE=706
-JSON_LT_VERSION="$JSON_LT_CURRENT:$JSON_LT_REVISION:$JSON_LT_AGE"
-JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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 test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* 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);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
 
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-fi
+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
 
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
 
 
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-depcc="$CC"   am_compiler_list=
+CC="$lt_save_CC"
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # 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'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
 
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > 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
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    case $depmode in
-    nosideeffect)
-      # 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
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # 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.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+JSON_MAJOR_VERSION=0
+JSON_MINOR_VERSION=10
+JSON_MICRO_VERSION=2
+JSON_VERSION=0.10.2
+JSON_RELEASE_STATUS=release
+
+
+
+
+
+
+JSON_LT_CURRENT=1000
+JSON_LT_REVISION=2
+JSON_LT_AGE=1000
+JSON_LT_VERSION="$JSON_LT_CURRENT:$JSON_LT_REVISION:$JSON_LT_AGE"
+JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION"
 
 
 { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
@@ -13440,11 +12820,10 @@
 { $as_echo "$as_me:$LINENO: checking for JSON" >&5
 $as_echo_n "checking for JSON... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$JSON_CFLAGS"; then
-        pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$JSON_CFLAGS"; then
+    pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.15\"") >&5
   ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.15") 2>&5
   ac_status=$?
@@ -13454,15 +12833,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$JSON_LIBS"; then
-        pkg_cv_JSON_LIBS="$JSON_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$JSON_LIBS"; then
+    pkg_cv_JSON_LIBS="$JSON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.15\"") >&5
   ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.15") 2>&5
   ac_status=$?
@@ -13472,9 +12849,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -13487,9 +12863,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gobject-2.0 >= 2.15"`
+	        JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= 2.15" 2>&1`
         else
-	        JSON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-2.0 >= 2.15"`
+	        JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= 2.15" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JSON_PKG_ERRORS" >&5
@@ -13567,7 +12943,7 @@
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug;
 else
-  enable_debug=yes
+  enable_debug=minimum
 fi
 
 
@@ -13598,7 +12974,7 @@
 if test "${enable_maintainer_flags+set}" = set; then
   enableval=$enable_maintainer_flags;
 else
-  enable_maintainer_flags=yes
+  enable_maintainer_flags=no
 fi
 
 
@@ -13607,7 +12983,9 @@
 
   list="-Werror -Wall -Wshadow -Wcast-align
                             -Wno-uninitialized -Wformat-security
-                            -Winit-self -Wempty-body"
+                            -Wno-strict-aliasing -Winit-self
+                            -Wempty-body -Wdeclaration-after-statement
+                            -Wno-strict-aliasing -Wno-strict-aliasing"
   flags_supported=""
   flags_unsupported=""
   { $as_echo "$as_me:$LINENO: checking for supported compiler flags" >&5
@@ -13681,6 +13059,7 @@
 
 
 
+
 # Check whether --with-html-dir was given.
 if test "${with_html_dir+set}" = set; then
   withval=$with_html_dir;
@@ -13813,21 +13192,21 @@
    { (exit 1); exit 1; }; }
 fi
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.3\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.3") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.4\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   found_introspection=yes
 else
-  { { $as_echo "$as_me:$LINENO: error: You need to have gobject-introspection >= 0.6.3 installed to build json-glib" >&5
-$as_echo "$as_me: error: You need to have gobject-introspection >= 0.6.3 installed to build json-glib" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: You need to have gobject-introspection >= 0.6.4 installed to build json-glib" >&5
+$as_echo "$as_me: error: You need to have gobject-introspection >= 0.6.4 installed to build json-glib" >&2;}
    { (exit 1); exit 1; }; }
 fi
      ;;
       auto)         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.3\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.3") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.4\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -13875,95 +13254,31 @@
 
 
 
-
-  # Check whether --enable-shave was given.
-if test "${enable_shave+set}" = set; then
-  enableval=$enable_shave;
-else
-  enable_shave=yes
-
+           # 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=0;;
+esac
+AM_BACKSLASH='\'
 
+           use_shave=no
 
-  if test x"$enable_shave" = xyes; then
-        shavedir="$ac_pwd/build/autotools"
-
-
-        MAKEFLAGS=-s
-
-    AM_MAKEFLAGS='`test -z $V && echo -s`'
-
-
-        # Extract the first word of "sed", so it can be a program name with args.
-set dummy sed; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_SED+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$SED"; then
-  ac_cv_prog_SED="$SED" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  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
-    ac_cv_prog_SED="sed"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
-fi
-fi
-SED=$ac_cv_prog_SED
-if test -n "$SED"; then
-  { $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
+ if test "x$use_shave" = "xyes"; then
+  USE_SHAVE_TRUE=
+  USE_SHAVE_FALSE='#'
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  USE_SHAVE_TRUE='#'
+  USE_SHAVE_FALSE=
 fi
 
 
-
-        SHAVE_SAVED_LIBTOOL=$LIBTOOL
-    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
-
-
-        SHAVE_SAVED_CC=$CC
-    SHAVE_SAVED_CXX=$CXX
-    SHAVE_SAVED_FC=$FC
-    SHAVE_SAVED_F77=$F77
-    SHAVE_SAVED_OBJC=$OBJC
-    CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
-    CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
-    FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
-    F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
-    OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
-
-
-
-
-
-
-    V=@
-  else
-    V=1
-  fi
-  Q='$(V:1=)'
-
-
-
-
-ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile build/autotools/shave-libtool build/autotools/shave json-glib/Makefile json-glib/json-version.h json-glib/tests/Makefile tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml json-glib.pc"
+ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile json-glib/Makefile json-glib/json-version.h json-glib/tests/Makefile tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml json-glib.pc"
 
 
 cat >confcache <<\_ACEOF
@@ -14063,6 +13378,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -14077,13 +13400,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${ENABLE_GLIB_TEST_TRUE}" && test -z "${ENABLE_GLIB_TEST_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GLIB_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -14112,6 +13428,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_SHAVE_TRUE}" && test -z "${USE_SHAVE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_SHAVE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"USE_SHAVE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -14434,7 +13757,7 @@
 # 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.7.6, which was
+This file was extended by json-glib $as_me 0.10.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14497,7 +13820,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-json-glib config.status 0.7.6
+json-glib config.status 0.10.2
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -14881,8 +14204,6 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
     "build/autotools/Makefile") CONFIG_FILES="$CONFIG_FILES build/autotools/Makefile" ;;
-    "build/autotools/shave-libtool") CONFIG_FILES="$CONFIG_FILES build/autotools/shave-libtool" ;;
-    "build/autotools/shave") CONFIG_FILES="$CONFIG_FILES build/autotools/shave" ;;
     "json-glib/Makefile") CONFIG_FILES="$CONFIG_FILES json-glib/Makefile" ;;
     "json-glib/json-version.h") CONFIG_FILES="$CONFIG_FILES json-glib/json-version.h" ;;
     "json-glib/tests/Makefile") CONFIG_FILES="$CONFIG_FILES json-glib/tests/Makefile" ;;
@@ -15545,27 +14866,28 @@
 
 
   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
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # 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
-  # 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.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 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
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # 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
+    # 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.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
@@ -15588,28 +14910,28 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # 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
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # 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
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
@@ -15632,7 +14954,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
+      { as_dir=$dirpart/$fdir
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
@@ -15673,10 +14995,11 @@
   } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
  ;;
     "libtool":C)
 
@@ -16355,13 +15678,18 @@
 fi
 
 
+
+echo ""
+echo " Json-GLib - $VERSION (${JSON_RELEASE_STATUS})"
+echo ""
+echo " • Prefix: ${prefix}"
+echo ""
+echo " • Debug level: ${enable_debug}"
+echo " • Compiler flags: ${MAINTAINER_CFLAGS}"
+echo " • Use shave: ${use_shave}"
 echo ""
-echo " Json-GLib $VERSION"
+echo " • API reference: ${enable_gtk_doc}"
 echo ""
-echo "                   Prefix: ${prefix}"
-echo "              Debug level: ${enable_debug}"
-echo "           Compiler flags: ${MAINTAINER_CFLAGS}"
-echo "            API reference: ${enable_gtk_doc}"
-echo "        Enable test suite: ${enable_glibtest}"
-echo " Build introspection data: ${enable_introspection}"
+echo " • Enable test suite: ${enable_glibtest}"
+echo " • Build introspection data: ${enable_introspection}"
 echo ""
diff -Nru json-glib-0.7.6/configure.ac json-glib-0.10.2/configure.ac
--- json-glib-0.7.6/configure.ac	2009-08-12 16:06:24.000000000 +0100
+++ json-glib-0.10.2/configure.ac	2010-02-26 14:03:50.000000000 +0000
@@ -1,10 +1,19 @@
+# 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], [7])
-m4_define([json_micro_version], [6])
+m4_define([json_minor_version], [10])
+m4_define([json_micro_version], [2])
 
 m4_define([json_version], [json_major_version.json_minor_version.json_micro_version])
 
-m4_define([json_interface_age], [0])
+m4_define([json_release_status],
+          [m4_if(m4_eval(json_micro_version % 2), [1], [git],
+                 [m4_if(m4_eval(json_minor_version % 2), [1], [snapshot],
+                                                              [release])])])
+
+# bump up by 1 for every micro release with no API changes, otherwise
+# set to 0. after release, bump up by 1
+m4_define([json_interface_age], [2])
 m4_define([json_binary_age], [m4_eval(100 * json_minor_version + json_micro_version)])
 
 m4_define([lt_current], [m4_eval(100 * json_minor_version + json_micro_version - json_interface_age)])
@@ -13,7 +22,7 @@
 
 m4_define([glib_req_version], [2.15])
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.61])
 
 AC_INIT([json-glib],
         [json_version],
@@ -28,6 +37,7 @@
 
 AM_DISABLE_STATIC
 AM_PATH_GLIB_2_0
+AM_PROG_CC_C_O
 AM_PROG_LIBTOOL
 
 # Honor aclocal flags
@@ -37,10 +47,12 @@
 JSON_MINOR_VERSION=json_minor_version
 JSON_MICRO_VERSION=json_micro_version
 JSON_VERSION=json_version
+JSON_RELEASE_STATUS=json_release_status
 AC_SUBST(JSON_MAJOR_VERSION)
 AC_SUBST(JSON_MICRO_VERSION)
 AC_SUBST(JSON_MINOR_VERSION)
 AC_SUBST(JSON_VERSION)
+AC_SUBST(JSON_RELEASE_STATUS)
 
 JSON_LT_CURRENT=lt_current
 JSON_LT_REVISION=lt_revision
@@ -49,7 +61,6 @@
 JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION"
 AC_SUBST(JSON_LT_LDFLAGS)
 
-AC_PROG_CC
 AC_HEADER_STDC
 AC_CHECK_HEADERS([unistd.h])
 AC_C_CONST
@@ -113,22 +124,37 @@
         AS_COMPILER_FLAGS([MAINTAINER_CFLAGS],
                           ["-Werror -Wall -Wshadow -Wcast-align
                             -Wno-uninitialized -Wformat-security
-                            -Winit-self -Wempty-body"])
+                            -Wno-strict-aliasing -Winit-self
+                            -Wempty-body -Wdeclaration-after-statement
+                            -Wno-strict-aliasing -Wno-strict-aliasing"])
       ]
 )
+AC_SUBST([MAINTAINER_CFLAGS])
 
 GTK_DOC_CHECK([1.11])
 
-GOBJECT_INTROSPECTION_CHECK([0.6.3])
+GOBJECT_INTROSPECTION_CHECK([0.6.4])
 
-SHAVE_INIT([build/autotools], [enable])
+m4_ifdef([AM_SILENT_RULES],
+         [
+           AM_SILENT_RULES([yes])
+           use_shave=no
+         ],
+         [
+           SHAVE_INIT([build/autotools], [enable])
+           AC_CONFIG_FILES([
+                build/autotools/shave-libtool
+                build/autotools/shave
+           ])
+           use_shave=yes
+         ])
+
+AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"])
 
 AC_CONFIG_FILES([
         Makefile
         build/Makefile
         build/autotools/Makefile
-        build/autotools/shave-libtool
-        build/autotools/shave
         json-glib/Makefile
         json-glib/json-version.h
         json-glib/tests/Makefile
@@ -141,13 +167,19 @@
 
 AC_OUTPUT
 
+dnl === Summary ===============================================================
+
+echo ""
+echo " Json-GLib - $VERSION (${JSON_RELEASE_STATUS})"
+echo ""
+echo " • Prefix: ${prefix}"
+echo ""
+echo " • Debug level: ${enable_debug}"
+echo " • Compiler flags: ${MAINTAINER_CFLAGS}"
+echo " • Use shave: ${use_shave}"
 echo ""
-echo " Json-GLib $VERSION"
+echo " • API reference: ${enable_gtk_doc}"
 echo ""
-echo "                   Prefix: ${prefix}"
-echo "              Debug level: ${enable_debug}"
-echo "           Compiler flags: ${MAINTAINER_CFLAGS}"
-echo "            API reference: ${enable_gtk_doc}"
-echo "        Enable test suite: ${enable_glibtest}"
-echo " Build introspection data: ${enable_introspection}"
+echo " • Enable test suite: ${enable_glibtest}"
+echo " • Build introspection data: ${enable_introspection}"
 echo ""
diff -Nru json-glib-0.7.6/debian/changelog json-glib-0.10.2/debian/changelog
--- json-glib-0.7.6/debian/changelog	2010-04-13 12:00:33.000000000 +0100
+++ json-glib-0.10.2/debian/changelog	2010-04-13 12:00:33.000000000 +0100
@@ -1,45 +1,28 @@
-json-glib (0.7.6-0ubuntu2) lucid; urgency=low
+json-glib (0.10.2-2~ppa10.04+1) lucid; urgency=low
 
-  * rebuild rest of main for armel armv7/thumb2 optimization;
-    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+  * Merge new upstream release from Debian Experimental to my-ppa
+  * Change Maintainer value to match the DebianMaintainerField Spec.
 
- -- Alexander Sack <asac@ubuntu.com>  Sat, 06 Mar 2010 13:29:14 +0100
+ -- Nicolas Derive <kalon33@ubuntu.com>  Tue, 13 Apr 2010 12:41:45 +0200
 
-json-glib (0.7.6-0ubuntu1) karmic; urgency=low
- 
-  * Remove upstreamed patch from package
-  * New upstream release (0.7.6):
-    - Actually use the int64 support in the Scanner
-  * New upstream release (0.7.4) (LP: #416336):
-    - Pre-compute the escape table
-    - Use JSON_NODE_OBJECT, not JSON_NODE_ARRAY when creating the node in
-      json_object_set_object_member
-    - Fix typo in JsonObject::set_object_member()
-    - Verify parsing base values
-    - Advance the tokenizer to avoid an infinite loop
-    - Auto-promote integer types to G_TYPE_INT64
-    - Do not sanitize the object member's name
-    - Disallow single header file inclusion
-    - Use our libtool for the typelib
+json-glib (0.10.2-2) unstable; urgency=low
 
- -- Rodrigo Moya <rodrigo.moya@canonical.com>  Thu, 20 Aug 2009 11:36:21 +0200
+  * Enable GObject introspection
 
-json-glib (0.7.2-0ubuntu2) karmic; urgency=low
+ -- Rob Bradford <robster@debian.org>  Tue, 16 Mar 2010 06:07:32 +0000
 
-  * Add upstream patch needed for couchdb-glib/evolution-couchdb
+json-glib (0.10.2-1) unstable; urgency=low
 
- -- Rodrigo Moya <rodrigo.moya@canonical.com>  Wed, 08 Jul 2009 18:45:48 +0200
+  * New upstream release
 
-json-glib (0.7.2-0ubuntu1) karmic; urgency=low
+ -- Rob Bradford <robster@debian.org>  Mon, 15 Mar 2010 15:44:13 +0000
 
-  [ Rodrigo Moya ]
-  * Package latest version, needed for upcoming couchdb-glib package.
-    (LP: #389461)
+json-glib (0.8.0-1) unstable; urgency=low
 
-  [ Martin Pitt ]
-  * debian/rules: Enable test suite on build.
+  * New upstream release (Closes: #547673)
+  * Fix documentation symlink (Closes: #532712)
 
- -- Rodrigo Moya <rodrigo.moya@canonical.com>  Fri, 19 Jun 2009 13:27:49 +0200
+ -- Ross Burton <ross@debian.org>  Mon, 28 Sep 2009 13:20:19 +0100
 
 json-glib (0.6.2-3) unstable; urgency=low
 
diff -Nru json-glib-0.7.6/debian/control json-glib-0.10.2/debian/control
--- json-glib-0.7.6/debian/control	2010-04-13 12:00:33.000000000 +0100
+++ json-glib-0.10.2/debian/control	2010-04-13 12:00:33.000000000 +0100
@@ -1,11 +1,18 @@
 Source: json-glib
 Section: libs
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Maintainer: Nicolas Derive <kalon33@ubuntu.com>
 XSBC-Original-Maintainer: Emmanuele Bassi <ebassi@openedhand.com>
 Uploaders: Rob Bradford <robster@debian.org>, Ross Burton <ross@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, libglib2.0-dev, gtk-doc-tools
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5),
+               cdbs (>= 0.4.41),
+               libglib2.0-dev,
+               gtk-doc-tools,
+               gir-repository-dev,
+               gir1.0-glib-2.0,
+               libgirepository1.0-dev (>= 0.6.3),
+               gobject-introspection (>= 0.6.5-3)
+Standards-Version: 3.8.3
 
 Package: libjson-glib-1.0-0
 Section: libs
@@ -19,10 +26,10 @@
  from JSON data types.
 
 Package: libjson-glib-1.0-0-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
-Depends: libjson-glib-1.0-0 (= ${binary:Version})
+Depends: libjson-glib-1.0-0 (= ${binary:Version}), ${misc:Depends}
 Description: GLib JSON manipulation library (debug symbols)
  JSON-GLib is a library for parsing, generating and manipulating JavaScript
  Object Notation (JSON) data streams using the GLib type system. It allows
@@ -60,3 +67,21 @@
  .
  This package contains the documentation.
 
+Package: gir1.0-json-glib-1.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GLib JSON manipulation library (documentation)
+ JSON-GLib is a library for parsing, generating and manipulating JavaScript
+ Object Notation (JSON) data streams using the GLib type system. It allows
+ manipulating JSON data types with a Document Object Model API. It also
+ allows serializing and deserializing simple or complex GObjects to and
+ from JSON data types.
+ .
+ This package contains introspection data.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+
diff -Nru json-glib-0.7.6/debian/gir1.0-json-glib-1.0.install json-glib-0.10.2/debian/gir1.0-json-glib-1.0.install
--- json-glib-0.7.6/debian/gir1.0-json-glib-1.0.install	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/debian/gir1.0-json-glib-1.0.install	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/
diff -Nru json-glib-0.7.6/debian/libjson-glib-dev.install json-glib-0.10.2/debian/libjson-glib-dev.install
--- json-glib-0.7.6/debian/libjson-glib-dev.install	2010-04-13 12:00:33.000000000 +0100
+++ json-glib-0.10.2/debian/libjson-glib-dev.install	2010-04-13 12:00:33.000000000 +0100
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/lib/pkgconfig/
 debian/tmp/usr/include/
+debian/tmp/usr/share/gir-1.0/
diff -Nru json-glib-0.7.6/debian/libjson-glib-doc.links json-glib-0.10.2/debian/libjson-glib-doc.links
--- json-glib-0.7.6/debian/libjson-glib-doc.links	2010-04-13 12:00:33.000000000 +0100
+++ json-glib-0.10.2/debian/libjson-glib-doc.links	2010-04-13 12:00:33.000000000 +0100
@@ -1 +1 @@
-usr/share/gtk-doc/html/clutter usr/share/doc/libclutter-doc/html
+usr/share/gtk-doc/html/json-glib usr/share/doc/libjson-glib-doc/html
diff -Nru json-glib-0.7.6/debian/rules json-glib-0.10.2/debian/rules
--- json-glib-0.7.6/debian/rules	2010-04-13 12:00:33.000000000 +0100
+++ json-glib-0.10.2/debian/rules	2010-04-13 12:00:33.000000000 +0100
@@ -1,13 +1,15 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 DEB_COMPRESS_EXCLUDE = .c
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc
-DEB_MAKE_CHECK_TARGET = test
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-introspection=yes
+
+$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
+	dh_girepository -p$(cdbs_curpkg)
 
 common-binary-predeb-arch:: list-missing
diff -Nru json-glib-0.7.6/depcomp json-glib-0.10.2/depcomp
--- json-glib-0.7.6/depcomp	2009-08-12 16:07:33.000000000 +0100
+++ json-glib-0.10.2/depcomp	2010-02-26 14:04:29.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2007-03-29.01
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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
@@ -17,9 +17,7 @@
 # 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
@@ -87,6 +85,15 @@
    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
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -192,14 +199,14 @@
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
-    echo >> $depfile
+' ' ' >> "$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
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -328,7 +335,12 @@
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
   else
     echo "#dummy" > "$depfile"
   fi
@@ -404,7 +416,7 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -455,32 +467,39 @@
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -500,7 +519,7 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -538,13 +557,27 @@
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@@ -557,16 +590,23 @@
 	;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -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"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
   echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # 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
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -585,5 +625,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru json-glib-0.7.6/doc/Makefile.am json-glib-0.10.2/doc/Makefile.am
--- json-glib-0.7.6/doc/Makefile.am	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/doc/Makefile.am	2009-10-29 14:37:07.000000000 +0000
@@ -1,3 +1,11 @@
-include $(top_srcdir)/Makefile.decl
-
 SUBDIRS = reference
+
+test-report:
+	@true
+
+test:
+	@true
+
+check-local: test
+
+.PHONY: test-report test check-local
diff -Nru json-glib-0.7.6/doc/Makefile.in json-glib-0.10.2/doc/Makefile.in
--- json-glib-0.7.6/doc/Makefile.in	2009-08-12 16:07:32.000000000 +0100
+++ json-glib-0.10.2/doc/Makefile.in	2010-02-26 14:04:29.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -13,12 +14,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-# JSON-GLib - JSON reader and writer library
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -33,9 +33,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.decl
 subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/build/autotools/as-compiler-flag.m4 \
@@ -46,13 +45,19 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -64,13 +69,41 @@
 	ps-recursive uninstall-recursive
 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
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -81,7 +114,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -92,8 +124,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -121,6 +151,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -130,12 +161,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -148,13 +178,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -202,24 +230,17 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-GTESTER = gtester
-GTESTER_REPORT = gtester-report
-
-# initialize variables for unconditional += appending
-EXTRA_DIST = 
-TEST_PROGS = 
 SUBDIRS = reference
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -228,9 +249,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -248,6 +269,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -262,7 +284,7 @@
 #     (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):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -279,7 +301,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -287,7 +309,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -313,16 +335,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -337,7 +359,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -349,7 +371,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -358,29 +380,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	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; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -401,29 +428,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -454,6 +496,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -472,6 +515,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -480,18 +525,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -512,8 +567,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.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 \
@@ -530,58 +585,16 @@
 	tags tags-recursive uninstall uninstall-am
 
 
-### testing rules
+test-report:
+	@true
+
+test:
+	@true
 
-# test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-	@ for subdir in $(SUBDIRS) . ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then	\
-	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	  elif test -n "${TEST_PROGS}" ; then \
-	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	  fi ; \
-	}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  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 ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
 check-local: test
+
+.PHONY: test-report test check-local
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/doc/reference/html/annotation-glossary.html json-glib-0.10.2/doc/reference/html/annotation-glossary.html
--- json-glib-0.7.6/doc/reference/html/annotation-glossary.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/annotation-glossary.html	2010-02-26 14:05:46.000000000 +0000
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Annotation Glossary</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
+<link rel="next" href="license.html" title="Appendix A. License">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ix06.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="license.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="glossary" title="Annotation Glossary">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<div class="glossdiv" title="O">
+<h3 class="title">O</h3>
+<dl>
+<dt>
+<a name="annotation-glossterm-out"></a>out</dt>
+<dd><p>Parameter for returning results. Default is <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer-full"><span class="acronym">transfer-full</span></a>.</p></dd>
+</dl>
+</div>
+<div class="glossdiv" title="A">
+<h3 class="title">A</h3>
+<dl>
+<dt>
+<a name="annotation-glossterm-allow-none"></a>allow-none</dt>
+<dd><p></p></dd>
+</dl>
+</div>
+<div class="glossdiv" title="E">
+<h3 class="title">E</h3>
+<dl>
+<dt>
+<a name="annotation-glossterm-element-type"></a>element-type</dt>
+<dd><p>Generics and defining elements of containers and arrays.</p></dd>
+</dl>
+</div>
+<div class="glossdiv" title="T">
+<h3 class="title">T</h3>
+<dl>
+<dt>
+<a name="annotation-glossterm-transfer"></a>transfer</dt>
+<dd><p></p></dd>
+</dl>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/ch01.html json-glib-0.10.2/doc/reference/html/ch01.html
--- json-glib-0.7.6/doc/reference/html/ch01.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ch01.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Data Types</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="json-glib-JSON-Node.html" title="JSON Node">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,13 +33,12 @@
 <td><a accesskey="p" href="json-base.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="json-base.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="json-glib-JSON-Node.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter" title="Data Types">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2577793"></a>Data Types</h2></div></div></div>
+<a name="id384852"></a>Data Types</h2></div></div></div>
 <div class="toc"><dl>
 <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>
diff -Nru json-glib-0.7.6/doc/reference/html/ch02.html json-glib-0.10.2/doc/reference/html/ch02.html
--- json-glib-0.7.6/doc/reference/html/ch02.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ch02.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Parser</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="JsonParser.html" title="JsonParser">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,13 +33,12 @@
 <td><a accesskey="p" href="json-streams.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="json-streams.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="JsonParser.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter" title="Parser">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2577832"></a>Parser</h2></div></div></div>
+<a name="id384889"></a>Parser</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="JsonParser.html">JsonParser</a></span><span class="refpurpose"> — Parse JSON data streams</span>
 </dt></dl></div>
diff -Nru json-glib-0.7.6/doc/reference/html/ch03.html json-glib-0.10.2/doc/reference/html/ch03.html
--- json-glib-0.7.6/doc/reference/html/ch03.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ch03.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Generator</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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="JsonParser.html" title="JsonParser">
 <link rel="next" href="JsonGenerator.html" title="JsonGenerator">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,13 +33,12 @@
 <td><a accesskey="p" href="JsonParser.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="json-streams.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="JsonGenerator.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter" title="Generator">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2537888"></a>Generator</h2></div></div></div>
+<a name="id388001"></a>Generator</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="JsonGenerator.html">JsonGenerator</a></span><span class="refpurpose"> — Generates JSON data streams</span>
 </dt></dl></div>
diff -Nru json-glib-0.7.6/doc/reference/html/ch04.html json-glib-0.10.2/doc/reference/html/ch04.html
--- json-glib-0.7.6/doc/reference/html/ch04.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ch04.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Object Hierarchy</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
+<link rel="next" href="ix01.html" title="Index">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="json-glib-Versioning-information.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="json-tools.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="ix01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter" title="Object Hierarchy">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id388048"></a>Object Hierarchy</h2></div></div></div>
+<pre class="screen">
+    <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a>
+        <a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a>
+        <a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a>
+</pre>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/index.html json-glib-0.10.2/doc/reference/html/index.html
--- json-glib-0.7.6/doc/reference/html/index.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/index.html	2010-04-13 12:00:33.000000000 +0100
@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JSON-GLib 0.7.6 Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<title>JSON-GLib Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,21 +16,27 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="book" title="JSON-GLib 0.7.6 Reference Manual">
+<div class="book" title="JSON-GLib Reference Manual">
 <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 0.7.6
- Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 0.7.6
+<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.10.2
 </p></div>
-<div><p class="copyright">Copyright © 2007 OpenedHand LTD</p></div>
+<div><p class="copyright">Copyright © 2007, 2008 OpenedHand LTD</p></div>
+<div><p class="copyright">Copyright © 2009 Intel Corporation</p></div>
 <div><div class="legalnotice" title="Legal Notice">
-<a name="id2577707"></a><p>
+<a name="id415283"></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
@@ -83,15 +89,31 @@
 </dt></dl></dd>
 </dl></dd>
 <dt><span class="part"><a href="json-advanced.html">IV. JSON-GLib Advanced API</a></span></dt>
-<dd><dl><dt>
-<span class="refentrytitle"><a href="json-glib-GObject-integration.html">GObject integration</a></span><span class="refpurpose"> — Serialize and deserialize GObjects</span>
-</dt></dl></dd>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="json-glib-GObject-Serialization.html">GObject Serialization</a></span><span class="refpurpose"> — Serialize and deserialize GObjects</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="json-glib-Serializable-Interface.html">Serializable Interface</a></span><span class="refpurpose"> — Interface for serialize and deserialize special GObjects</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="json-glib-Boxed-Types-Serialization.html">Boxed Types Serialization</a></span><span class="refpurpose"> — Serialize and deserialize GBoxed types</span>
+</dt>
+</dl></dd>
 <dt><span class="part"><a href="json-tools.html">V. JSON-GLib Additional Reference</a></span></dt>
-<dd><dl><dt>
+<dd><dl>
+<dt>
 <span class="refentrytitle"><a href="json-glib-Versioning-information.html">Versioning information</a></span><span class="refpurpose"> — JSON-GLib version checking</span>
-</dt></dl></dd>
+</dt>
+<dt><span class="chapter"><a href="ch04.html">Object Hierarchy</a></span></dt>
+</dl></dd>
 <dt><span class="index"><a href="ix01.html">Index</a></span></dt>
-<dt><span class="index"><a href="ix02.html">Index of new symbols in 0.4</a></span></dt>
+<dt><span class="index"><a href="ix02.html">Index of deprecated symbols</a></span></dt>
+<dt><span class="index"><a href="ix03.html">Index of new symbols in 0.4</a></span></dt>
+<dt><span class="index"><a href="ix04.html">Index of new symbols in 0.6</a></span></dt>
+<dt><span class="index"><a href="ix05.html">Index of new symbols in 0.8</a></span></dt>
+<dt><span class="index"><a href="ix06.html">Index of new symbols in 0.10</a></span></dt>
+<dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt>
 <dt><span class="appendix"><a href="license.html">A. License</a></span></dt>
 </dl></div>
 </div>
diff -Nru json-glib-0.7.6/doc/reference/html/index.sgml json-glib-0.10.2/doc/reference/html/index.sgml
--- json-glib-0.7.6/doc/reference/html/index.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/index.sgml	2010-02-26 14:05:46.000000000 +0000
@@ -3,8 +3,13 @@
 <ANCHOR id="json-glib-JSON-Node.description" href="json-glib/json-glib-JSON-Node.html#json-glib-JSON-Node.description">
 <ANCHOR id="json-glib-JSON-Node.details" href="json-glib/json-glib-JSON-Node.html#json-glib-JSON-Node.details">
 <ANCHOR id="JsonNodeType" href="json-glib/json-glib-JSON-Node.html#JsonNodeType">
-<ANCHOR id="JSON-NODE-TYPE--CAPS" href="json-glib/json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS">
 <ANCHOR id="JsonNode" href="json-glib/json-glib-JSON-Node.html#JsonNode">
+<ANCHOR id="JSON-NODE-TYPE--CAPS" href="json-glib/json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS">
+<ANCHOR id="JSON-NODE-HOLDS--CAPS" href="json-glib/json-glib-JSON-Node.html#JSON-NODE-HOLDS--CAPS">
+<ANCHOR id="JSON-NODE-HOLDS-VALUE--CAPS" href="json-glib/json-glib-JSON-Node.html#JSON-NODE-HOLDS-VALUE--CAPS">
+<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-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">
@@ -27,6 +32,7 @@
 <ANCHOR id="json-node-set-string" href="json-glib/json-glib-JSON-Node.html#json-node-set-string">
 <ANCHOR id="json-node-get-string" href="json-glib/json-glib-JSON-Node.html#json-node-get-string">
 <ANCHOR id="json-node-dup-string" href="json-glib/json-glib-JSON-Node.html#json-node-dup-string">
+<ANCHOR id="json-node-set-parent" href="json-glib/json-glib-JSON-Node.html#json-node-set-parent">
 <ANCHOR id="json-node-get-parent" href="json-glib/json-glib-JSON-Node.html#json-node-get-parent">
 <ANCHOR id="json-node-type-name" href="json-glib/json-glib-JSON-Node.html#json-node-type-name">
 <ANCHOR id="json-node-get-value-type" href="json-glib/json-glib-JSON-Node.html#json-node-get-value-type">
@@ -139,15 +145,37 @@
 <ANCHOR id="JsonGenerator--indent-char" href="json-glib/JsonGenerator.html#JsonGenerator--indent-char">
 <ANCHOR id="JsonGenerator--pretty" href="json-glib/JsonGenerator.html#JsonGenerator--pretty">
 <ANCHOR id="JsonGenerator--root" href="json-glib/JsonGenerator.html#JsonGenerator--root">
-<ANCHOR id="json-glib-GObject-integration" href="json-glib/json-glib-GObject-integration.html">
-<ANCHOR id="json-glib-GObject-integration.synopsis" href="json-glib/json-glib-GObject-integration.html#json-glib-GObject-integration.synopsis">
-<ANCHOR id="json-glib-GObject-integration.description" href="json-glib/json-glib-GObject-integration.html#json-glib-GObject-integration.description">
-<ANCHOR id="json-glib-GObject-integration.details" href="json-glib/json-glib-GObject-integration.html#json-glib-GObject-integration.details">
-<ANCHOR id="JsonSerializableIface" href="json-glib/json-glib-GObject-integration.html#JsonSerializableIface">
-<ANCHOR id="json-serializable-serialize-property" href="json-glib/json-glib-GObject-integration.html#json-serializable-serialize-property">
-<ANCHOR id="json-serializable-deserialize-property" href="json-glib/json-glib-GObject-integration.html#json-serializable-deserialize-property">
-<ANCHOR id="json-serialize-gobject" href="json-glib/json-glib-GObject-integration.html#json-serialize-gobject">
-<ANCHOR id="json-construct-gobject" href="json-glib/json-glib-GObject-integration.html#json-construct-gobject">
+<ANCHOR id="json-glib-GObject-Serialization" href="json-glib/json-glib-GObject-Serialization.html">
+<ANCHOR id="json-glib-GObject-Serialization.synopsis" href="json-glib/json-glib-GObject-Serialization.html#json-glib-GObject-Serialization.synopsis">
+<ANCHOR id="json-glib-GObject-Serialization.description" href="json-glib/json-glib-GObject-Serialization.html#json-glib-GObject-Serialization.description">
+<ANCHOR id="json-glib-GObject-Serialization.details" href="json-glib/json-glib-GObject-Serialization.html#json-glib-GObject-Serialization.details">
+<ANCHOR id="json-gobject-serialize" href="json-glib/json-glib-GObject-Serialization.html#json-gobject-serialize">
+<ANCHOR id="json-gobject-deserialize" href="json-glib/json-glib-GObject-Serialization.html#json-gobject-deserialize">
+<ANCHOR id="json-gobject-to-data" href="json-glib/json-glib-GObject-Serialization.html#json-gobject-to-data">
+<ANCHOR id="json-gobject-from-data" href="json-glib/json-glib-GObject-Serialization.html#json-gobject-from-data">
+<ANCHOR id="json-construct-gobject" href="json-glib/json-glib-GObject-Serialization.html#json-construct-gobject">
+<ANCHOR id="json-serialize-gobject" href="json-glib/json-glib-GObject-Serialization.html#json-serialize-gobject">
+<ANCHOR id="json-glib-Serializable-Interface" href="json-glib/json-glib-Serializable-Interface.html">
+<ANCHOR id="json-glib-Serializable-Interface.synopsis" href="json-glib/json-glib-Serializable-Interface.html#json-glib-Serializable-Interface.synopsis">
+<ANCHOR id="json-glib-Serializable-Interface.description" href="json-glib/json-glib-Serializable-Interface.html#json-glib-Serializable-Interface.description">
+<ANCHOR id="json-glib-Serializable-Interface.details" href="json-glib/json-glib-Serializable-Interface.html#json-glib-Serializable-Interface.details">
+<ANCHOR id="JsonSerializableIface" href="json-glib/json-glib-Serializable-Interface.html#JsonSerializableIface">
+<ANCHOR id="json-serializable-serialize-property" href="json-glib/json-glib-Serializable-Interface.html#json-serializable-serialize-property">
+<ANCHOR id="json-serializable-deserialize-property" href="json-glib/json-glib-Serializable-Interface.html#json-serializable-deserialize-property">
+<ANCHOR id="json-serializable-default-serialize-property" href="json-glib/json-glib-Serializable-Interface.html#json-serializable-default-serialize-property">
+<ANCHOR id="json-serializable-default-deserialize-property" href="json-glib/json-glib-Serializable-Interface.html#json-serializable-default-deserialize-property">
+<ANCHOR id="json-glib-Boxed-Types-Serialization" href="json-glib/json-glib-Boxed-Types-Serialization.html">
+<ANCHOR id="json-glib-Boxed-Types-Serialization.synopsis" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-glib-Boxed-Types-Serialization.synopsis">
+<ANCHOR id="json-glib-Boxed-Types-Serialization.description" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-glib-Boxed-Types-Serialization.description">
+<ANCHOR id="json-glib-Boxed-Types-Serialization.details" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-glib-Boxed-Types-Serialization.details">
+<ANCHOR id="JsonBoxedSerializeFunc" href="json-glib/json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc">
+<ANCHOR id="JsonBoxedDeserializeFunc" href="json-glib/json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc">
+<ANCHOR id="json-boxed-register-serialize-func" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-boxed-register-serialize-func">
+<ANCHOR id="json-boxed-register-deserialize-func" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-boxed-register-deserialize-func">
+<ANCHOR id="json-boxed-can-serialize" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-boxed-can-serialize">
+<ANCHOR id="json-boxed-can-deserialize" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-boxed-can-deserialize">
+<ANCHOR id="json-boxed-serialize" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-boxed-serialize">
+<ANCHOR id="json-boxed-deserialize" href="json-glib/json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize">
 <ANCHOR id="json-glib-Versioning-information" href="json-glib/json-glib-Versioning-information.html">
 <ANCHOR id="json-glib-Versioning-information.synopsis" href="json-glib/json-glib-Versioning-information.html#json-glib-Versioning-information.synopsis">
 <ANCHOR id="json-glib-Versioning-information.description" href="json-glib/json-glib-Versioning-information.html#json-glib-Versioning-information.description">
@@ -159,3 +187,7 @@
 <ANCHOR id="JSON-VERSION-S--CAPS" href="json-glib/json-glib-Versioning-information.html#JSON-VERSION-S--CAPS">
 <ANCHOR id="JSON-VERSION-HEX--CAPS" href="json-glib/json-glib-Versioning-information.html#JSON-VERSION-HEX--CAPS">
 <ANCHOR id="JSON-CHECK-VERSION--CAPS" href="json-glib/json-glib-Versioning-information.html#JSON-CHECK-VERSION--CAPS">
+<ANCHOR id="annotation-glossterm-out" href="json-glib/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-allow-none" href="json-glib/annotation-glossary.html#annotation-glossterm-allow-none">
+<ANCHOR id="annotation-glossterm-element-type" href="json-glib/annotation-glossary.html#annotation-glossterm-element-type">
+<ANCHOR id="annotation-glossterm-transfer" href="json-glib/annotation-glossary.html#annotation-glossterm-transfer">
diff -Nru json-glib-0.7.6/doc/reference/html/ix01.html json-glib-0.10.2/doc/reference/html/ix01.html
--- json-glib-0.7.6/doc/reference/html/ix01.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ix01.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,11 +3,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="prev" href="json-glib-Versioning-information.html" title="Versioning information">
-<link rel="next" href="ix02.html" title="Index of new symbols in 0.4">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
+<link rel="next" href="ix02.html" title="Index of deprecated symbols">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
@@ -18,281 +18,374 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="json-glib-Versioning-information.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="ch04.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="ix02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="index" title="Index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2537928"></a>Index</h2></div></div></div>
-<div class="index"><div class="indexdiv">
-<h3>J</h3>
+<a name="id388061"></a>Index</h2></div></div></div>
+<div class="indexdiv">
+<div class="indexdiv" title="A">
+<h3 class="title">A</h3>
 <dl>
-<dt>JsonArray, <a class="indexterm" href="json-glib-JSON-Array.html#JsonArray">JsonArray</a>
-</dt>
-<dt>JsonArrayForeach, <a class="indexterm" href="json-glib-JSON-Array.html#JsonArrayForeach">JsonArrayForeach ()</a>
-</dt>
-<dt>JsonGenerator, <a class="indexterm" href="JsonGenerator.html#JsonGenerator-struct">JsonGenerator</a>
-</dt>
-<dt>JsonGenerator:indent, <a class="indexterm" href="JsonGenerator.html#JsonGenerator--indent">The "indent" property</a>
-</dt>
-<dt>JsonGenerator:indent-char, <a class="indexterm" href="JsonGenerator.html#JsonGenerator--indent-char">The "indent-char" property</a>
-</dt>
-<dt>JsonGenerator:pretty, <a class="indexterm" href="JsonGenerator.html#JsonGenerator--pretty">The "pretty" property</a>
-</dt>
-<dt>JsonGenerator:root, <a class="indexterm" href="JsonGenerator.html#JsonGenerator--root">The "root" property</a>
-</dt>
-<dt>JsonGeneratorClass, <a class="indexterm" href="JsonGenerator.html#JsonGeneratorClass">JsonGeneratorClass</a>
-</dt>
-<dt>JsonNode, <a class="indexterm" href="json-glib-JSON-Node.html#JsonNode">JsonNode</a>
-</dt>
-<dt>JsonNodeType, <a class="indexterm" href="json-glib-JSON-Node.html#JsonNodeType">enum JsonNodeType</a>
-</dt>
-<dt>JsonObject, <a class="indexterm" href="json-glib-JSON-Object.html#JsonObject">JsonObject</a>
-</dt>
-<dt>JsonObjectForeach, <a class="indexterm" href="json-glib-JSON-Object.html#JsonObjectForeach">JsonObjectForeach ()</a>
-</dt>
-<dt>JsonParser, <a class="indexterm" href="JsonParser.html#JsonParser-struct">JsonParser</a>
-</dt>
-<dt>JsonParser::array-element, <a class="indexterm" href="JsonParser.html#JsonParser-array-element">The "array-element" signal</a>
-</dt>
-<dt>JsonParser::array-end, <a class="indexterm" href="JsonParser.html#JsonParser-array-end">The "array-end" signal</a>
-</dt>
-<dt>JsonParser::array-start, <a class="indexterm" href="JsonParser.html#JsonParser-array-start">The "array-start" signal</a>
-</dt>
-<dt>JsonParser::error, <a class="indexterm" href="JsonParser.html#JsonParser-error">The "error" signal</a>
-</dt>
-<dt>JsonParser::object-end, <a class="indexterm" href="JsonParser.html#JsonParser-object-end">The "object-end" signal</a>
-</dt>
-<dt>JsonParser::object-member, <a class="indexterm" href="JsonParser.html#JsonParser-object-member">The "object-member" signal</a>
-</dt>
-<dt>JsonParser::object-start, <a class="indexterm" href="JsonParser.html#JsonParser-object-start">The "object-start" signal</a>
-</dt>
-<dt>JsonParser::parse-end, <a class="indexterm" href="JsonParser.html#JsonParser-parse-end">The "parse-end" signal</a>
-</dt>
-<dt>JsonParser::parse-start, <a class="indexterm" href="JsonParser.html#JsonParser-parse-start">The "parse-start" signal</a>
-</dt>
-<dt>JsonParserClass, <a class="indexterm" href="JsonParser.html#JsonParserClass">JsonParserClass</a>
-</dt>
-<dt>JsonParserError, <a class="indexterm" href="JsonParser.html#JsonParserError">enum JsonParserError</a>
-</dt>
-<dt>JsonSerializableIface, <a class="indexterm" href="json-glib-GObject-integration.html#JsonSerializableIface">JsonSerializableIface</a>
-</dt>
-<dt>json_array_add_array_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-array-element">json_array_add_array_element ()</a>
-</dt>
-<dt>json_array_add_boolean_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-boolean-element">json_array_add_boolean_element ()</a>
-</dt>
-<dt>json_array_add_double_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-double-element">json_array_add_double_element ()</a>
-</dt>
-<dt>json_array_add_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-element">json_array_add_element ()</a>
-</dt>
-<dt>json_array_add_int_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-int-element">json_array_add_int_element ()</a>
-</dt>
-<dt>json_array_add_null_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-null-element">json_array_add_null_element ()</a>
-</dt>
-<dt>json_array_add_object_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-object-element">json_array_add_object_element ()</a>
-</dt>
-<dt>json_array_add_string_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-add-string-element">json_array_add_string_element ()</a>
-</dt>
-<dt>json_array_dup_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-dup-element">json_array_dup_element ()</a>
-</dt>
-<dt>json_array_foreach_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-foreach-element">json_array_foreach_element ()</a>
-</dt>
-<dt>json_array_get_array_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-array-element">json_array_get_array_element ()</a>
-</dt>
-<dt>json_array_get_boolean_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-boolean-element">json_array_get_boolean_element ()</a>
-</dt>
-<dt>json_array_get_double_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-double-element">json_array_get_double_element ()</a>
-</dt>
-<dt>json_array_get_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-element">json_array_get_element ()</a>
-</dt>
-<dt>json_array_get_elements, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-elements">json_array_get_elements ()</a>
-</dt>
-<dt>json_array_get_int_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-int-element">json_array_get_int_element ()</a>
-</dt>
-<dt>json_array_get_length, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-length">json_array_get_length ()</a>
-</dt>
-<dt>json_array_get_null_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-null-element">json_array_get_null_element ()</a>
-</dt>
-<dt>json_array_get_object_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-object-element">json_array_get_object_element ()</a>
-</dt>
-<dt>json_array_get_string_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-get-string-element">json_array_get_string_element ()</a>
-</dt>
-<dt>json_array_new, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-new">json_array_new ()</a>
-</dt>
-<dt>json_array_ref, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-ref">json_array_ref ()</a>
-</dt>
-<dt>json_array_remove_element, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-remove-element">json_array_remove_element ()</a>
-</dt>
-<dt>json_array_sized_new, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-sized-new">json_array_sized_new ()</a>
-</dt>
-<dt>json_array_unref, <a class="indexterm" href="json-glib-JSON-Array.html#json-array-unref">json_array_unref ()</a>
-</dt>
-<dt>JSON_CHECK_VERSION, <a class="indexterm" href="json-glib-Versioning-information.html#JSON-CHECK-VERSION--CAPS">JSON_CHECK_VERSION()</a>
-</dt>
-<dt>json_construct_gobject, <a class="indexterm" href="json-glib-GObject-integration.html#json-construct-gobject">json_construct_gobject ()</a>
-</dt>
-<dt>json_generator_new, <a class="indexterm" href="JsonGenerator.html#json-generator-new">json_generator_new ()</a>
-</dt>
-<dt>json_generator_set_root, <a class="indexterm" href="JsonGenerator.html#json-generator-set-root">json_generator_set_root ()</a>
-</dt>
-<dt>json_generator_to_data, <a class="indexterm" href="JsonGenerator.html#json-generator-to-data">json_generator_to_data ()</a>
-</dt>
-<dt>json_generator_to_file, <a class="indexterm" href="JsonGenerator.html#json-generator-to-file">json_generator_to_file ()</a>
-</dt>
-<dt>JSON_MAJOR_VERSION, <a class="indexterm" href="json-glib-Versioning-information.html#JSON-MAJOR-VERSION--CAPS">JSON_MAJOR_VERSION</a>
-</dt>
-<dt>JSON_MICRO_VERSION, <a class="indexterm" href="json-glib-Versioning-information.html#JSON-MICRO-VERSION--CAPS">JSON_MICRO_VERSION</a>
-</dt>
-<dt>JSON_MINOR_VERSION, <a class="indexterm" href="json-glib-Versioning-information.html#JSON-MINOR-VERSION--CAPS">JSON_MINOR_VERSION</a>
-</dt>
-<dt>json_node_copy, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-copy">json_node_copy ()</a>
-</dt>
-<dt>json_node_dup_array, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-dup-array">json_node_dup_array ()</a>
-</dt>
-<dt>json_node_dup_object, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-dup-object">json_node_dup_object ()</a>
-</dt>
-<dt>json_node_dup_string, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-dup-string">json_node_dup_string ()</a>
-</dt>
-<dt>json_node_free, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-free">json_node_free ()</a>
-</dt>
-<dt>json_node_get_array, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-array">json_node_get_array ()</a>
-</dt>
-<dt>json_node_get_boolean, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-boolean">json_node_get_boolean ()</a>
-</dt>
-<dt>json_node_get_double, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-double">json_node_get_double ()</a>
-</dt>
-<dt>json_node_get_int, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-int">json_node_get_int ()</a>
-</dt>
-<dt>json_node_get_node_type, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-node-type">json_node_get_node_type ()</a>
-</dt>
-<dt>json_node_get_object, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-object">json_node_get_object ()</a>
-</dt>
-<dt>json_node_get_parent, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-parent">json_node_get_parent ()</a>
-</dt>
-<dt>json_node_get_string, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-string">json_node_get_string ()</a>
-</dt>
-<dt>json_node_get_value, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-value">json_node_get_value ()</a>
-</dt>
-<dt>json_node_get_value_type, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-value-type">json_node_get_value_type ()</a>
-</dt>
-<dt>json_node_is_null, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-is-null">json_node_is_null ()</a>
-</dt>
-<dt>json_node_new, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-new">json_node_new ()</a>
-</dt>
-<dt>json_node_set_array, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-set-array">json_node_set_array ()</a>
-</dt>
-<dt>json_node_set_boolean, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-set-boolean">json_node_set_boolean ()</a>
-</dt>
-<dt>json_node_set_double, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-set-double">json_node_set_double ()</a>
-</dt>
-<dt>json_node_set_int, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-set-int">json_node_set_int ()</a>
-</dt>
-<dt>json_node_set_object, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-set-object">json_node_set_object ()</a>
-</dt>
-<dt>json_node_set_string, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-set-string">json_node_set_string ()</a>
-</dt>
-<dt>json_node_set_value, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-set-value">json_node_set_value ()</a>
-</dt>
-<dt>json_node_take_array, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-take-array">json_node_take_array ()</a>
-</dt>
-<dt>json_node_take_object, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-take-object">json_node_take_object ()</a>
-</dt>
-<dt>JSON_NODE_TYPE, <a class="indexterm" href="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS">JSON_NODE_TYPE()</a>
-</dt>
-<dt>json_node_type_name, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-type-name">json_node_type_name ()</a>
-</dt>
-<dt>json_object_add_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-add-member">json_object_add_member ()</a>
-</dt>
-<dt>json_object_dup_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-dup-member">json_object_dup_member ()</a>
-</dt>
-<dt>json_object_foreach_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-foreach-member">json_object_foreach_member ()</a>
-</dt>
-<dt>json_object_get_array_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-array-member">json_object_get_array_member ()</a>
-</dt>
-<dt>json_object_get_boolean_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-boolean-member">json_object_get_boolean_member ()</a>
-</dt>
-<dt>json_object_get_double_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-double-member">json_object_get_double_member ()</a>
-</dt>
-<dt>json_object_get_int_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-int-member">json_object_get_int_member ()</a>
-</dt>
-<dt>json_object_get_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-member">json_object_get_member ()</a>
-</dt>
-<dt>json_object_get_members, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-members">json_object_get_members ()</a>
-</dt>
-<dt>json_object_get_null_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-null-member">json_object_get_null_member ()</a>
-</dt>
-<dt>json_object_get_object_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-object-member">json_object_get_object_member ()</a>
-</dt>
-<dt>json_object_get_size, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-size">json_object_get_size ()</a>
-</dt>
-<dt>json_object_get_string_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-string-member">json_object_get_string_member ()</a>
-</dt>
-<dt>json_object_get_values, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-get-values">json_object_get_values ()</a>
-</dt>
-<dt>json_object_has_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-has-member">json_object_has_member ()</a>
-</dt>
-<dt>json_object_new, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-new">json_object_new ()</a>
-</dt>
-<dt>json_object_ref, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-ref">json_object_ref ()</a>
-</dt>
-<dt>json_object_remove_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-remove-member">json_object_remove_member ()</a>
-</dt>
-<dt>json_object_set_array_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-array-member">json_object_set_array_member ()</a>
-</dt>
-<dt>json_object_set_boolean_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-boolean-member">json_object_set_boolean_member ()</a>
-</dt>
-<dt>json_object_set_double_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-double-member">json_object_set_double_member ()</a>
-</dt>
-<dt>json_object_set_int_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-int-member">json_object_set_int_member ()</a>
-</dt>
-<dt>json_object_set_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-member">json_object_set_member ()</a>
-</dt>
-<dt>json_object_set_null_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-null-member">json_object_set_null_member ()</a>
-</dt>
-<dt>json_object_set_object_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-object-member">json_object_set_object_member ()</a>
-</dt>
-<dt>json_object_set_string_member, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-set-string-member">json_object_set_string_member ()</a>
-</dt>
-<dt>json_object_unref, <a class="indexterm" href="json-glib-JSON-Object.html#json-object-unref">json_object_unref ()</a>
-</dt>
-<dt>json_parser_get_current_line, <a class="indexterm" href="JsonParser.html#json-parser-get-current-line">json_parser_get_current_line ()</a>
-</dt>
-<dt>json_parser_get_current_pos, <a class="indexterm" href="JsonParser.html#json-parser-get-current-pos">json_parser_get_current_pos ()</a>
-</dt>
-<dt>json_parser_get_root, <a class="indexterm" href="JsonParser.html#json-parser-get-root">json_parser_get_root ()</a>
-</dt>
-<dt>json_parser_has_assignment, <a class="indexterm" href="JsonParser.html#json-parser-has-assignment">json_parser_has_assignment ()</a>
-</dt>
-<dt>json_parser_load_from_data, <a class="indexterm" href="JsonParser.html#json-parser-load-from-data">json_parser_load_from_data ()</a>
-</dt>
-<dt>json_parser_load_from_file, <a class="indexterm" href="JsonParser.html#json-parser-load-from-file">json_parser_load_from_file ()</a>
-</dt>
-<dt>json_parser_new, <a class="indexterm" href="JsonParser.html#json-parser-new">json_parser_new ()</a>
-</dt>
-<dt>json_serializable_deserialize_property, <a class="indexterm" href="json-glib-GObject-integration.html#json-serializable-deserialize-property">json_serializable_deserialize_property ()</a>
-</dt>
-<dt>json_serializable_serialize_property, <a class="indexterm" href="json-glib-GObject-integration.html#json-serializable-serialize-property">json_serializable_serialize_property ()</a>
-</dt>
-<dt>json_serialize_gobject, <a class="indexterm" href="json-glib-GObject-integration.html#json-serialize-gobject">json_serialize_gobject ()</a>
-</dt>
-<dt>JSON_VERSION, <a class="indexterm" href="json-glib-Versioning-information.html#JSON-VERSION--CAPS">JSON_VERSION</a>
-</dt>
-<dt>JSON_VERSION_HEX, <a class="indexterm" href="json-glib-Versioning-information.html#JSON-VERSION-HEX--CAPS">JSON_VERSION_HEX</a>
-</dt>
-<dt>JSON_VERSION_S, <a class="indexterm" href="json-glib-Versioning-information.html#JSON-VERSION-S--CAPS">JSON_VERSION_S</a>
-</dt>
+<dt><a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#JsonArrayForeach" title="JsonArrayForeach ()">JsonArrayForeach</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-array-element" title="json_array_add_array_element ()">json_array_add_array_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-boolean-element" title="json_array_add_boolean_element ()">json_array_add_boolean_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-double-element" title="json_array_add_double_element ()">json_array_add_double_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-element" title="json_array_add_element ()">json_array_add_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-int-element" title="json_array_add_int_element ()">json_array_add_int_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-null-element" title="json_array_add_null_element ()">json_array_add_null_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-object-element" title="json_array_add_object_element ()">json_array_add_object_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-string-element" title="json_array_add_string_element ()">json_array_add_string_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-dup-element" title="json_array_dup_element ()">json_array_dup_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-foreach-element" title="json_array_foreach_element ()">json_array_foreach_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-array-element" title="json_array_get_array_element ()">json_array_get_array_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-boolean-element" title="json_array_get_boolean_element ()">json_array_get_boolean_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-double-element" title="json_array_get_double_element ()">json_array_get_double_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-element" title="json_array_get_element ()">json_array_get_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-elements" title="json_array_get_elements ()">json_array_get_elements</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-int-element" title="json_array_get_int_element ()">json_array_get_int_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-length" title="json_array_get_length ()">json_array_get_length</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-null-element" title="json_array_get_null_element ()">json_array_get_null_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-object-element" title="json_array_get_object_element ()">json_array_get_object_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-string-element" title="json_array_get_string_element ()">json_array_get_string_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-new" title="json_array_new ()">json_array_new</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-ref" title="json_array_ref ()">json_array_ref</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-remove-element" title="json_array_remove_element ()">json_array_remove_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-sized-new" title="json_array_sized_new ()">json_array_sized_new</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-unref" title="json_array_unref ()">json_array_unref</a></dt>
+<dd></dd>
 </dl>
-</div></div>
+</div>
+<div class="indexdiv" title="B">
+<h3 class="title">B</h3>
+<dl>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()">JsonBoxedDeserializeFunc</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc" title="JsonBoxedSerializeFunc ()">JsonBoxedSerializeFunc</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-deserialize" title="json_boxed_can_deserialize ()">json_boxed_can_deserialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-serialize" title="json_boxed_can_serialize ()">json_boxed_can_serialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize" title="json_boxed_deserialize ()">json_boxed_deserialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-register-deserialize-func" title="json_boxed_register_deserialize_func ()">json_boxed_register_deserialize_func</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-register-serialize-func" title="json_boxed_register_serialize_func ()">json_boxed_register_serialize_func</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-serialize" title="json_boxed_serialize ()">json_boxed_serialize</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="C">
+<h3 class="title">C</h3>
+<dl>
+<dt><a class="link" href="json-glib-Versioning-information.html#JSON-CHECK-VERSION--CAPS" title="JSON_CHECK_VERSION()">JSON_CHECK_VERSION</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="G">
+<h3 class="title">G</h3>
+<dl>
+<dt><a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#JsonGenerator--indent" title='The "indent" property'>JsonGenerator:indent</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#JsonGenerator--indent-char" title='The "indent-char" property'>JsonGenerator:indent-char</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#JsonGenerator--pretty" title='The "pretty" property'>JsonGenerator:pretty</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#JsonGenerator--root" title='The "root" property'>JsonGenerator:root</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#JsonGeneratorClass" title="JsonGeneratorClass">JsonGeneratorClass</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#json-generator-new" title="json_generator_new ()">json_generator_new</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#json-generator-set-root" title="json_generator_set_root ()">json_generator_set_root</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#json-generator-to-data" title="json_generator_to_data ()">json_generator_to_data</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonGenerator.html#json-generator-to-file" title="json_generator_to_file ()">json_generator_to_file</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-deserialize" title="json_gobject_deserialize ()">json_gobject_deserialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-from-data" title="json_gobject_from_data ()">json_gobject_from_data</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-serialize" title="json_gobject_serialize ()">json_gobject_serialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-to-data" title="json_gobject_to_data ()">json_gobject_to_data</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="M">
+<h3 class="title">M</h3>
+<dl>
+<dt><a class="link" href="json-glib-Versioning-information.html#JSON-MAJOR-VERSION--CAPS" title="JSON_MAJOR_VERSION">JSON_MAJOR_VERSION</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Versioning-information.html#JSON-MICRO-VERSION--CAPS" title="JSON_MICRO_VERSION">JSON_MICRO_VERSION</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Versioning-information.html#JSON-MINOR-VERSION--CAPS" title="JSON_MINOR_VERSION">JSON_MINOR_VERSION</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="N">
+<h3 class="title">N</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</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></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-dup-array" title="json_node_dup_array ()">json_node_dup_array</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-dup-object" title="json_node_dup_object ()">json_node_dup_object</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-dup-string" title="json_node_dup_string ()">json_node_dup_string</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-free" title="json_node_free ()">json_node_free</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-array" title="json_node_get_array ()">json_node_get_array</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-boolean" title="json_node_get_boolean ()">json_node_get_boolean</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-double" title="json_node_get_double ()">json_node_get_double</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-int" title="json_node_get_int ()">json_node_get_int</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-node-type" title="json_node_get_node_type ()">json_node_get_node_type</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-object" title="json_node_get_object ()">json_node_get_object</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-parent" title="json_node_get_parent ()">json_node_get_parent</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-string" title="json_node_get_string ()">json_node_get_string</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-value" title="json_node_get_value ()">json_node_get_value</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-value-type" title="json_node_get_value_type ()">json_node_get_value_type</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS--CAPS" title="JSON_NODE_HOLDS()">JSON_NODE_HOLDS</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-ARRAY--CAPS" title="JSON_NODE_HOLDS_ARRAY()">JSON_NODE_HOLDS_ARRAY</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-NULL--CAPS" title="JSON_NODE_HOLDS_NULL()">JSON_NODE_HOLDS_NULL</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-OBJECT--CAPS" title="JSON_NODE_HOLDS_OBJECT()">JSON_NODE_HOLDS_OBJECT</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-VALUE--CAPS" title="JSON_NODE_HOLDS_VALUE()">JSON_NODE_HOLDS_VALUE</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></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-new" title="json_node_new ()">json_node_new</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-array" title="json_node_set_array ()">json_node_set_array</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-boolean" title="json_node_set_boolean ()">json_node_set_boolean</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-double" title="json_node_set_double ()">json_node_set_double</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-int" title="json_node_set_int ()">json_node_set_int</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-object" title="json_node_set_object ()">json_node_set_object</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-parent" title="json_node_set_parent ()">json_node_set_parent</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-string" title="json_node_set_string ()">json_node_set_string</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-value" title="json_node_set_value ()">json_node_set_value</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-take-array" title="json_node_take_array ()">json_node_take_array</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-take-object" title="json_node_take_object ()">json_node_take_object</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS" title="JSON_NODE_TYPE()">JSON_NODE_TYPE</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-type-name" title="json_node_type_name ()">json_node_type_name</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="O">
+<h3 class="title">O</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#JsonObjectForeach" title="JsonObjectForeach ()">JsonObjectForeach</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-add-member" title="json_object_add_member ()">json_object_add_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-dup-member" title="json_object_dup_member ()">json_object_dup_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-foreach-member" title="json_object_foreach_member ()">json_object_foreach_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-array-member" title="json_object_get_array_member ()">json_object_get_array_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-boolean-member" title="json_object_get_boolean_member ()">json_object_get_boolean_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-double-member" title="json_object_get_double_member ()">json_object_get_double_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-int-member" title="json_object_get_int_member ()">json_object_get_int_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-member" title="json_object_get_member ()">json_object_get_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-members" title="json_object_get_members ()">json_object_get_members</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-null-member" title="json_object_get_null_member ()">json_object_get_null_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-object-member" title="json_object_get_object_member ()">json_object_get_object_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-size" title="json_object_get_size ()">json_object_get_size</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-string-member" title="json_object_get_string_member ()">json_object_get_string_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-values" title="json_object_get_values ()">json_object_get_values</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-has-member" title="json_object_has_member ()">json_object_has_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-new" title="json_object_new ()">json_object_new</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-ref" title="json_object_ref ()">json_object_ref</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-remove-member" title="json_object_remove_member ()">json_object_remove_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-array-member" title="json_object_set_array_member ()">json_object_set_array_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-boolean-member" title="json_object_set_boolean_member ()">json_object_set_boolean_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-double-member" title="json_object_set_double_member ()">json_object_set_double_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-int-member" title="json_object_set_int_member ()">json_object_set_int_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()">json_object_set_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-null-member" title="json_object_set_null_member ()">json_object_set_null_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-object-member" title="json_object_set_object_member ()">json_object_set_object_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-string-member" title="json_object_set_string_member ()">json_object_set_string_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-unref" title="json_object_unref ()">json_object_unref</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="P">
+<h3 class="title">P</h3>
+<dl>
+<dt><a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-array-element" title='The "array-element" signal'>JsonParser::array-element</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-array-end" title='The "array-end" signal'>JsonParser::array-end</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-array-start" title='The "array-start" signal'>JsonParser::array-start</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-error" title='The "error" signal'>JsonParser::error</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-object-end" title='The "object-end" signal'>JsonParser::object-end</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-object-member" title='The "object-member" signal'>JsonParser::object-member</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-object-start" title='The "object-start" signal'>JsonParser::object-start</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-parse-end" title='The "parse-end" signal'>JsonParser::parse-end</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParser-parse-start" title='The "parse-start" signal'>JsonParser::parse-start</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParserClass" title="JsonParserClass">JsonParserClass</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#JsonParserError" title="enum JsonParserError">JsonParserError</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#json-parser-get-current-line" title="json_parser_get_current_line ()">json_parser_get_current_line</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#json-parser-get-current-pos" title="json_parser_get_current_pos ()">json_parser_get_current_pos</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#json-parser-get-root" title="json_parser_get_root ()">json_parser_get_root</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#json-parser-has-assignment" title="json_parser_has_assignment ()">json_parser_has_assignment</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#json-parser-load-from-data" title="json_parser_load_from_data ()">json_parser_load_from_data</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#json-parser-load-from-file" title="json_parser_load_from_file ()">json_parser_load_from_file</a></dt>
+<dd></dd>
+<dt><a class="link" href="JsonParser.html#json-parser-new" title="json_parser_new ()">json_parser_new</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="S">
+<h3 class="title">S</h3>
+<dl>
+<dt><a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="JsonSerializableIface">JsonSerializableIface</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Serializable-Interface.html#json-serializable-default-deserialize-property" title="json_serializable_default_deserialize_property ()">json_serializable_default_deserialize_property</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Serializable-Interface.html#json-serializable-default-serialize-property" title="json_serializable_default_serialize_property ()">json_serializable_default_serialize_property</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Serializable-Interface.html#json-serializable-deserialize-property" title="json_serializable_deserialize_property ()">json_serializable_deserialize_property</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Serializable-Interface.html#json-serializable-serialize-property" title="json_serializable_serialize_property ()">json_serializable_serialize_property</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()">json_serialize_gobject</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="V">
+<h3 class="title">V</h3>
+<dl>
+<dt><a class="link" href="json-glib-Versioning-information.html#JSON-VERSION--CAPS" title="JSON_VERSION">JSON_VERSION</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Versioning-information.html#JSON-VERSION-HEX--CAPS" title="JSON_VERSION_HEX">JSON_VERSION_HEX</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Versioning-information.html#JSON-VERSION-S--CAPS" title="JSON_VERSION_S">JSON_VERSION_S</a></dt>
+<dd></dd>
+</dl>
+</div>
+<dl></dl>
+</div>
 </div>
 <div class="footer">
 <hr>
diff -Nru json-glib-0.7.6/doc/reference/html/ix02.html json-glib-0.10.2/doc/reference/html/ix02.html
--- json-glib-0.7.6/doc/reference/html/ix02.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ix02.html	2010-04-13 12:00:33.000000000 +0100
@@ -2,12 +2,12 @@
 <html>
 <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.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<title>Index of deprecated symbols</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
-<link rel="next" href="license.html" title="Appendix A. License">
+<link rel="next" href="ix03.html" title="Index of new symbols in 0.4">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,26 +33,36 @@
 <td><a accesskey="p" href="ix01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
-<td><a accesskey="n" href="license.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="ix03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
-<div class="index" title="Index of new symbols in 0.4">
+<div class="index" title="Index of deprecated symbols">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2537934"></a>Index of new symbols in 0.4</h2></div></div></div>
-<div class="index"><div class="indexdiv">
-<h3>J</h3>
+<a name="id384424"></a>Index of deprecated symbols</h2></div></div></div>
+<div class="indexdiv">
+<div class="indexdiv" title="C">
+<h3 class="title">C</h3>
 <dl>
-<dt>JsonGenerator:root, <a class="indexterm" href="JsonGenerator.html#JsonGenerator--root">The "root" property</a>
-</dt>
-<dt>json_construct_gobject, <a class="indexterm" href="json-glib-GObject-integration.html#json-construct-gobject">json_construct_gobject ()</a>
-</dt>
-<dt>json_node_get_value_type, <a class="indexterm" href="json-glib-JSON-Node.html#json-node-get-value-type">json_node_get_value_type ()</a>
-</dt>
-<dt>json_parser_has_assignment, <a class="indexterm" href="JsonParser.html#json-parser-has-assignment">json_parser_has_assignment ()</a>
-</dt>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a></dt>
+<dd></dd>
 </dl>
-</div></div>
+</div>
+<div class="indexdiv" title="O">
+<h3 class="title">O</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-add-member" title="json_object_add_member ()">json_object_add_member</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="S">
+<h3 class="title">S</h3>
+<dl>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()">json_serialize_gobject</a></dt>
+<dd></dd>
+</dl>
+</div>
+<dl></dl>
+</div>
 </div>
 <div class="footer">
 <hr>
diff -Nru json-glib-0.7.6/doc/reference/html/ix03.html json-glib-0.10.2/doc/reference/html/ix03.html
--- json-glib-0.7.6/doc/reference/html/ix03.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ix03.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<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.75.2">
+<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">
+<link rel="next" href="ix04.html" title="Index of new symbols in 0.6">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ix02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="ix04.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="index" title="Index of new symbols in 0.4">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id384438"></a>Index of new symbols in 0.4</h2></div></div></div>
+<div class="indexdiv">
+<div class="indexdiv" title="C">
+<h3 class="title">C</h3>
+<dl>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="G">
+<h3 class="title">G</h3>
+<dl>
+<dt><a class="link" href="JsonGenerator.html#JsonGenerator--root" title='The "root" property'>JsonGenerator:root</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="N">
+<h3 class="title">N</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-value-type" title="json_node_get_value_type ()">json_node_get_value_type</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="P">
+<h3 class="title">P</h3>
+<dl>
+<dt><a class="link" href="JsonParser.html#json-parser-has-assignment" title="json_parser_has_assignment ()">json_parser_has_assignment</a></dt>
+<dd></dd>
+</dl>
+</div>
+<dl></dl>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/ix04.html json-glib-0.10.2/doc/reference/html/ix04.html
--- json-glib-0.7.6/doc/reference/html/ix04.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ix04.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<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.75.2">
+<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">
+<link rel="next" href="ix05.html" title="Index of new symbols in 0.8">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ix03.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="ix05.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="index" title="Index of new symbols in 0.6">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id384452"></a>Index of new symbols in 0.6</h2></div></div></div>
+<div class="indexdiv">
+<div class="indexdiv" title="A">
+<h3 class="title">A</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-dup-element" title="json_array_dup_element ()">json_array_dup_element</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="G">
+<h3 class="title">G</h3>
+<dl>
+<dt><a class="link" href="JsonGenerator.html#JsonGenerator--indent-char" title='The "indent-char" property'>JsonGenerator:indent-char</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="O">
+<h3 class="title">O</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-dup-member" title="json_object_dup_member ()">json_object_dup_member</a></dt>
+<dd></dd>
+</dl>
+</div>
+<dl></dl>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/ix05.html json-glib-0.10.2/doc/reference/html/ix05.html
--- json-glib-0.7.6/doc/reference/html/ix05.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ix05.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<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.75.2">
+<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">
+<link rel="next" href="ix06.html" title="Index of new symbols in 0.10">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ix04.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="ix06.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="index" title="Index of new symbols in 0.8">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id384467"></a>Index of new symbols in 0.8</h2></div></div></div>
+<div class="indexdiv">
+<div class="indexdiv" title="A">
+<h3 class="title">A</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Array.html#JsonArrayForeach" title="JsonArrayForeach ()">JsonArrayForeach</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-array-element" title="json_array_add_array_element ()">json_array_add_array_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-boolean-element" title="json_array_add_boolean_element ()">json_array_add_boolean_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-double-element" title="json_array_add_double_element ()">json_array_add_double_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-int-element" title="json_array_add_int_element ()">json_array_add_int_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-null-element" title="json_array_add_null_element ()">json_array_add_null_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-object-element" title="json_array_add_object_element ()">json_array_add_object_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-add-string-element" title="json_array_add_string_element ()">json_array_add_string_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-foreach-element" title="json_array_foreach_element ()">json_array_foreach_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-array-element" title="json_array_get_array_element ()">json_array_get_array_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-boolean-element" title="json_array_get_boolean_element ()">json_array_get_boolean_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-double-element" title="json_array_get_double_element ()">json_array_get_double_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-int-element" title="json_array_get_int_element ()">json_array_get_int_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-null-element" title="json_array_get_null_element ()">json_array_get_null_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-object-element" title="json_array_get_object_element ()">json_array_get_object_element</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Array.html#json-array-get-string-element" title="json_array_get_string_element ()">json_array_get_string_element</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="N">
+<h3 class="title">N</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-get-node-type" title="json_node_get_node_type ()">json_node_get_node_type</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></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#json-node-set-parent" title="json_node_set_parent ()">json_node_set_parent</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="O">
+<h3 class="title">O</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Object.html#JsonObjectForeach" title="JsonObjectForeach ()">JsonObjectForeach</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-foreach-member" title="json_object_foreach_member ()">json_object_foreach_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-array-member" title="json_object_get_array_member ()">json_object_get_array_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-boolean-member" title="json_object_get_boolean_member ()">json_object_get_boolean_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-double-member" title="json_object_get_double_member ()">json_object_get_double_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-int-member" title="json_object_get_int_member ()">json_object_get_int_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-null-member" title="json_object_get_null_member ()">json_object_get_null_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-object-member" title="json_object_get_object_member ()">json_object_get_object_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-get-string-member" title="json_object_get_string_member ()">json_object_get_string_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-array-member" title="json_object_set_array_member ()">json_object_set_array_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-boolean-member" title="json_object_set_boolean_member ()">json_object_set_boolean_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-double-member" title="json_object_set_double_member ()">json_object_set_double_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-int-member" title="json_object_set_int_member ()">json_object_set_int_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()">json_object_set_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-null-member" title="json_object_set_null_member ()">json_object_set_null_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-object-member" title="json_object_set_object_member ()">json_object_set_object_member</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Object.html#json-object-set-string-member" title="json_object_set_string_member ()">json_object_set_string_member</a></dt>
+<dd></dd>
+</dl>
+</div>
+<dl></dl>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/ix06.html json-glib-0.10.2/doc/reference/html/ix06.html
--- json-glib-0.7.6/doc/reference/html/ix06.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/ix06.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<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.75.2">
+<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">
+<link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<td><a accesskey="p" href="ix05.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="index" title="Index of new symbols in 0.10">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="id384481"></a>Index of new symbols in 0.10</h2></div></div></div>
+<div class="indexdiv">
+<div class="indexdiv" title="B">
+<h3 class="title">B</h3>
+<dl>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()">JsonBoxedDeserializeFunc</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc" title="JsonBoxedSerializeFunc ()">JsonBoxedSerializeFunc</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-deserialize" title="json_boxed_can_deserialize ()">json_boxed_can_deserialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-serialize" title="json_boxed_can_serialize ()">json_boxed_can_serialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize" title="json_boxed_deserialize ()">json_boxed_deserialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-register-deserialize-func" title="json_boxed_register_deserialize_func ()">json_boxed_register_deserialize_func</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-register-serialize-func" title="json_boxed_register_serialize_func ()">json_boxed_register_serialize_func</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-serialize" title="json_boxed_serialize ()">json_boxed_serialize</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="G">
+<h3 class="title">G</h3>
+<dl>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-deserialize" title="json_gobject_deserialize ()">json_gobject_deserialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-from-data" title="json_gobject_from_data ()">json_gobject_from_data</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-serialize" title="json_gobject_serialize ()">json_gobject_serialize</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-GObject-Serialization.html#json-gobject-to-data" title="json_gobject_to_data ()">json_gobject_to_data</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="N">
+<h3 class="title">N</h3>
+<dl>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS--CAPS" title="JSON_NODE_HOLDS()">JSON_NODE_HOLDS</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-ARRAY--CAPS" title="JSON_NODE_HOLDS_ARRAY()">JSON_NODE_HOLDS_ARRAY</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-NULL--CAPS" title="JSON_NODE_HOLDS_NULL()">JSON_NODE_HOLDS_NULL</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-OBJECT--CAPS" title="JSON_NODE_HOLDS_OBJECT()">JSON_NODE_HOLDS_OBJECT</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-VALUE--CAPS" title="JSON_NODE_HOLDS_VALUE()">JSON_NODE_HOLDS_VALUE</a></dt>
+<dd></dd>
+</dl>
+</div>
+<div class="indexdiv" title="S">
+<h3 class="title">S</h3>
+<dl>
+<dt><a class="link" href="json-glib-Serializable-Interface.html#json-serializable-default-deserialize-property" title="json_serializable_default_deserialize_property ()">json_serializable_default_deserialize_property</a></dt>
+<dd></dd>
+<dt><a class="link" href="json-glib-Serializable-Interface.html#json-serializable-default-serialize-property" title="json_serializable_default_serialize_property ()">json_serializable_default_serialize_property</a></dt>
+<dd></dd>
+</dl>
+</div>
+<dl></dl>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/json-advanced.html json-glib-0.10.2/doc/reference/html/json-advanced.html
--- json-glib-0.7.6/doc/reference/html/json-advanced.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-advanced.html	2010-02-26 14:05:46.000000000 +0000
@@ -3,11 +3,11 @@
 <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.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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="JsonGenerator.html" title="JsonGenerator">
-<link rel="next" href="json-glib-GObject-integration.html" title="GObject integration">
+<link rel="next" href="json-glib-GObject-Serialization.html" title="GObject Serialization">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,18 +33,25 @@
 <td><a accesskey="p" href="JsonGenerator.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
-<td><a accesskey="n" href="json-glib-GObject-integration.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="json-glib-GObject-Serialization.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part" title="Part IV. JSON-GLib Advanced API">
 <div class="titlepage"><div><div><h1 class="title">
 <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><dt>
-<span class="refentrytitle"><a href="json-glib-GObject-integration.html">GObject integration</a></span><span class="refpurpose"> — Serialize and deserialize GObjects</span>
-</dt></dl>
+<dl>
+<dt>
+<span class="refentrytitle"><a href="json-glib-GObject-Serialization.html">GObject Serialization</a></span><span class="refpurpose"> — Serialize and deserialize GObjects</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="json-glib-Serializable-Interface.html">Serializable Interface</a></span><span class="refpurpose"> — Interface for serialize and deserialize special GObjects</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="json-glib-Boxed-Types-Serialization.html">Boxed Types Serialization</a></span><span class="refpurpose"> — Serialize and deserialize GBoxed types</span>
+</dt>
+</dl>
 </div>
 </div>
 <div class="footer">
diff -Nru json-glib-0.7.6/doc/reference/html/json-base.html json-glib-0.10.2/doc/reference/html/json-base.html
--- json-glib-0.7.6/doc/reference/html/json-base.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-base.html	2010-02-26 14:05:46.000000000 +0000
@@ -3,9 +3,9 @@
 <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.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
+<link rel="up" href="index.html" title="JSON-GLib Reference Manual">
 <link rel="prev" href="json-glib.html" title="Part I. JSON-GLib Overview">
 <link rel="next" href="ch01.html" title="Data Types">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,8 +33,7 @@
 <td><a accesskey="p" href="json-glib.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="ch01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part" title="Part II. JSON-GLib Reference">
diff -Nru json-glib-0.7.6/doc/reference/html/JsonGenerator.html json-glib-0.10.2/doc/reference/html/JsonGenerator.html
--- json-glib-0.7.6/doc/reference/html/JsonGenerator.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/JsonGenerator.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>JsonGenerator</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,8 +34,7 @@
 <td><a accesskey="p" href="ch03.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="json-advanced.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
@@ -58,19 +63,19 @@
                     <a class="link" href="JsonGenerator.html#JsonGeneratorClass" title="JsonGeneratorClass">JsonGeneratorClass</a>;
 <a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a> *     <a class="link" href="JsonGenerator.html#json-generator-new" title="json_generator_new ()">json_generator_new</a>                  (void);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="JsonGenerator.html#json-generator-to-file" title="json_generator_to_file ()">json_generator_to_file</a>              (<a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a> *generator,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *filename,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
+href="../glib/glib-Error-Reporting.html#GError"
 >GError</a> **error);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *             <a class="link" href="JsonGenerator.html#json-generator-to-data" title="json_generator_to_data ()">json_generator_to_data</a>              (<a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a> *generator,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"
+href="../glib/glib-Basic-Types.html#gsize"
 >gsize</a> *length);
 void                <a class="link" href="JsonGenerator.html#json-generator-set-root" title="json_generator_set_root ()">json_generator_set_root</a>             (<a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a> *generator,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
@@ -80,7 +85,7 @@
 <a name="JsonGenerator.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
 >GObject</a>
    +----JsonGenerator
 </pre>
@@ -89,13 +94,13 @@
 <a name="JsonGenerator.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="JsonGenerator.html#JsonGenerator--indent" title='The "indent" property'>indent</a>"                   <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>                 : Read / Write
   "<a class="link" href="JsonGenerator.html#JsonGenerator--indent-char" title='The "indent-char" property'>indent-char</a>"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>                 : Read / Write
   "<a class="link" href="JsonGenerator.html#JsonGenerator--pretty" title='The "pretty" property'>pretty</a>"                   <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>              : Read / Write
   "<a class="link" href="JsonGenerator.html#JsonGenerator--root" title='The "root" property'>root</a>"                     <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a>*             : Read / Write
 </pre>
@@ -153,13 +158,13 @@
 <div class="refsect2" title="json_generator_to_file ()">
 <a name="json-generator-to-file"></a><h3>json_generator_to_file ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_generator_to_file              (<a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a> *generator,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *filename,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
+href="../glib/glib-Error-Reporting.html#GError"
 >GError</a> **error);</pre>
 <p>
 Creates a JSON data stream and puts it inside <em class="parameter"><code>filename</code></em>, overwriting the
@@ -182,17 +187,13 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td> return location for a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+href="../glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a>, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if saving was successful.
+<td> <code class="literal">TRUE</code> if saving was successful.
 </td>
 </tr>
 </tbody>
@@ -202,10 +203,10 @@
 <div class="refsect2" title="json_generator_to_data ()">
 <a name="json-generator-to-data"></a><h3>json_generator_to_data ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *             json_generator_to_data              (<a class="link" href="JsonGenerator.html" title="JsonGenerator">JsonGenerator</a> *generator,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"
+href="../glib/glib-Basic-Types.html#gsize"
 >gsize</a> *length);</pre>
 <p>
 Generates a JSON data stream from <em class="parameter"><code>generator</code></em> and returns it as a
@@ -222,16 +223,13 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
-<td> return location for the length of the returned buffer, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
-</td>
+<td>out. <acronym title="Parameter for returning results. Default is transfer-full."><span class="acronym">out</span></acronym>. </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated buffer holding a JSON data stream. Use
-  <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"
+<td> a newly allocated buffer holding a JSON data stream.
+  Use <a
+href="../glib/glib-Memory-Allocation.html#g-free"
 ><code class="function">g_free()</code></a> to free the allocated resources.
 </td>
 </tr>
@@ -248,8 +246,10 @@
 the <a class="link" href="JsonGenerator.html" title="JsonGenerator"><span class="type">JsonGenerator</span></a>.
 </p>
 <p>
-Note: the node is copied by the generator object, so it can be safely
-freed after calling this function.</p>
+</p>
+<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Note</h3>The node is copied by the generator object, so it can be safely
+freed after calling this function.</div>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -274,7 +274,7 @@
 <div class="refsect2" title='The "indent" property'>
 <a name="JsonGenerator--indent"></a><h3>The <code class="literal">"indent"</code> property</h3>
 <pre class="programlisting">  "indent"                   <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>                 : Read / Write</pre>
 <p>
 Number of spaces to be used to indent when pretty printing.</p>
@@ -286,7 +286,7 @@
 <div class="refsect2" title='The "indent-char" property'>
 <a name="JsonGenerator--indent-char"></a><h3>The <code class="literal">"indent-char"</code> property</h3>
 <pre class="programlisting">  "indent-char"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>                 : Read / Write</pre>
 <p>
 The character that should be used when indenting in pretty print.</p>
@@ -299,7 +299,7 @@
 <div class="refsect2" title='The "pretty" property'>
 <a name="JsonGenerator--pretty"></a><h3>The <code class="literal">"pretty"</code> property</h3>
 <pre class="programlisting">  "pretty"                   <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>              : Read / Write</pre>
 <p>
 Whether the output should be "pretty-printed", with indentation and
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-Boxed-Types-Serialization.html json-glib-0.10.2/doc/reference/html/json-glib-Boxed-Types-Serialization.html
--- json-glib-0.7.6/doc/reference/html/json-glib-Boxed-Types-Serialization.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-Boxed-Types-Serialization.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,448 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<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.75.2">
+<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">
+<link rel="next" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="json-glib-Serializable-Interface.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="json-advanced.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="json-tools.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#json-glib-Boxed-Types-Serialization.synopsis" class="shortcut">Top</a>
+                 | 
+                <a href="#json-glib-Boxed-Types-Serialization.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="Boxed Types Serialization">
+<a name="json-glib-Boxed-Types-Serialization"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="json-glib-Boxed-Types-Serialization.top_of_page"></a>Boxed Types Serialization</span></h2>
+<p>Boxed Types Serialization — Serialize and deserialize GBoxed types</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="json-glib-Boxed-Types-Serialization.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          (<a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc" title="JsonBoxedSerializeFunc ()">*JsonBoxedSerializeFunc</a>)           (<a
+href="../glib/glib-Basic-Types.html#gconstpointer"
+>gconstpointer</a> boxed);
+<a
+href="../glib/glib-Basic-Types.html#gpointer"
+>gpointer</a>            (<a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()">*JsonBoxedDeserializeFunc</a>)         (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
+void                <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-register-serialize-func" title="json_boxed_register_serialize_func ()">json_boxed_register_serialize_func</a>  (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> node_type,
+                                                         <a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc" title="JsonBoxedSerializeFunc ()">JsonBoxedSerializeFunc</a> serialize_func);
+void                <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-register-deserialize-func" title="json_boxed_register_deserialize_func ()">json_boxed_register_deserialize_func</a>
+                                                        (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> node_type,
+                                                         <a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()">JsonBoxedDeserializeFunc</a> deserialize_func);
+
+<a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-serialize" title="json_boxed_can_serialize ()">json_boxed_can_serialize</a>            (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> *node_type);
+<a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-can-deserialize" title="json_boxed_can_deserialize ()">json_boxed_can_deserialize</a>          (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> node_type);
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-serialize" title="json_boxed_serialize ()">json_boxed_serialize</a>                (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gconstpointer"
+>gconstpointer</a> boxed);
+<a
+href="../glib/glib-Basic-Types.html#gpointer"
+>gpointer</a>            <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize" title="json_boxed_deserialize ()">json_boxed_deserialize</a>              (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="json-glib-Boxed-Types-Serialization.description"></a><h2>Description</h2>
+<p>
+GLib's <span class="type">GBoxed</span> type is a generic wrapper for arbitrary C structures.
+</p>
+<p>
+JSON-GLib allows serialization and deserialization of a <span class="type">GBoxed</span> type
+by registering functions mapping a <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a> to a specific
+<a
+href="../gobject/gobject-Type-Information.html#GType"
+><span class="type">GType</span></a>.
+</p>
+<p>
+When registering a <span class="type">GBoxed</span> type you should also register the
+corresponding transformation functions, e.g.:
+</p>
+<p>
+</p>
+<div class="informalexample"><pre class="programlisting">
+  GType
+  my_struct_get_type (void)
+  {
+    static GType boxed_type = 0;
+
+    if (boxed_type == 0)
+      {
+        boxed_type =
+          g_boxed_type_register_static (g_intern_static_string ("MyStruct"),
+                                        (GBoxedCopyFunc) my_struct_copy,
+                                        (GBoxedFreeFunc) my_struct_free);
+
+        json_boxed_register_serialize_func (boxed_type, JSON_NODE_OBJECT,
+                                            my_struct_serialize);
+        json_boxed_register_deserialize_func (boxed_type, JSON_NODE_OBJECT,
+                                              my_struct_deserialize);
+      }
+
+    return boxed_type;
+  }
+</pre></div>
+<p>
+</p>
+<p>
+The serialization function will be invoked by <a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-serialize" title="json_boxed_serialize ()"><code class="function">json_boxed_serialize()</code></a>:
+it will be passed a pointer to the C structure and it must return a
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. The deserialization function will be invoked by
+<a class="link" href="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize" title="json_boxed_deserialize ()"><code class="function">json_boxed_deserialize()</code></a>: it will be passed a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> for the
+declared type and it must return a newly allocated C structure.
+</p>
+<p>
+It is possible to check whether a <span class="type">GBoxed</span> type can be deserialized
+from a specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a>, and whether a <span class="type">GBoxed</span> can be serialized
+and to which specific <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a>.</p>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="json-glib-Boxed-Types-Serialization.details"></a><h2>Details</h2>
+<div class="refsect2" title="JsonBoxedSerializeFunc ()">
+<a name="JsonBoxedSerializeFunc"></a><h3>JsonBoxedSerializeFunc ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          (*JsonBoxedSerializeFunc)           (<a
+href="../glib/glib-Basic-Types.html#gconstpointer"
+>gconstpointer</a> boxed);</pre>
+<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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>boxed</code></em> :</span></p></td>
+<td> a <span class="type">GBoxed</span>
+</td>
+</tr>
+<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-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="JsonBoxedDeserializeFunc ()">
+<a name="JsonBoxedDeserializeFunc"></a><h3>JsonBoxedDeserializeFunc ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gpointer"
+>gpointer</a>            (*JsonBoxedDeserializeFunc)         (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
+<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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<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>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the newly created boxed type
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_boxed_register_serialize_func ()">
+<a name="json-boxed-register-serialize-func"></a><h3>json_boxed_register_serialize_func ()</h3>
+<pre class="programlisting">void                json_boxed_register_serialize_func  (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> node_type,
+                                                         <a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc" title="JsonBoxedSerializeFunc ()">JsonBoxedSerializeFunc</a> serialize_func);</pre>
+<p>
+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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
+<td> a boxed type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node_type</code></em> :</span></p></td>
+<td> a node type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>serialize_func</code></em> :</span></p></td>
+<td> serialization function for <em class="parameter"><code>boxed_type</code></em> into
+  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>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_boxed_register_deserialize_func ()">
+<a name="json-boxed-register-deserialize-func"></a><h3>json_boxed_register_deserialize_func ()</h3>
+<pre class="programlisting">void                json_boxed_register_deserialize_func
+                                                        (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> node_type,
+                                                         <a class="link" href="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" title="JsonBoxedDeserializeFunc ()">JsonBoxedDeserializeFunc</a> deserialize_func);</pre>
+<p>
+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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
+<td> a boxed type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node_type</code></em> :</span></p></td>
+<td> a node type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>deserialize_func</code></em> :</span></p></td>
+<td> deserialization function for <em class="parameter"><code>boxed_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>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_boxed_can_serialize ()">
+<a name="json-boxed-can-serialize"></a><h3>json_boxed_can_serialize ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            json_boxed_can_serialize            (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> *node_type);</pre>
+<p>
+Checks whether it is possible to serialize 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>. The type of the
+<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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
+<td> a boxed type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node_type</code></em> :</span></p></td>
+<td>out. <acronym title="Parameter for returning results. Default is transfer-full."><span class="acronym">out</span></acronym>. </td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> <code class="literal">TRUE</code> if the type can be serialized,
+  and <code class="literal">FALSE</code> otherwise.
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_boxed_can_deserialize ()">
+<a name="json-boxed-can-deserialize"></a><h3>json_boxed_can_deserialize ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            json_boxed_can_deserialize          (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> node_type);</pre>
+<p>
+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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
+<td> a boxed type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>node_type</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> type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> <code class="literal">TRUE</code> if the type can be deserialized, <code class="literal">FALSE</code> otherwise
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_boxed_serialize ()">
+<a name="json-boxed-serialize"></a><h3>json_boxed_serialize ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_boxed_serialize                (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gconstpointer"
+>gconstpointer</a> boxed);</pre>
+<p>
+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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
+<td> a boxed type
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>boxed</code></em> :</span></p></td>
+<td> a pointer to a <span class="type">GBoxed</span> of type <em class="parameter"><code>gboxed_type</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> with the serialization of the boxed
+  type, or <code class="literal">NULL</code> if serialization either failed or was not
+  possible
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_boxed_deserialize ()">
+<a name="json-boxed-deserialize"></a><h3>json_boxed_deserialize ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gpointer"
+>gpointer</a>            json_boxed_deserialize              (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gboxed_type,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
+<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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gboxed_type</code></em> :</span></p></td>
+<td> a boxed type
+</td>
+</tr>
+<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>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the newly allocated <span class="type">GBoxed</span>. Use <a
+href="../gobject/gobject-Boxed-Types.html#g-boxed-free"
+><code class="function">g_boxed_free()</code></a> to
+  release the resources allocated by this function
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib.devhelp json-glib-0.10.2/doc/reference/html/json-glib.devhelp
--- json-glib-0.7.6/doc/reference/html/json-glib.devhelp	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib.devhelp	2010-02-26 14:05:46.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="JSON-GLib 0.7.6&#10; Reference Manual" link="index.html" author="" name="json-glib">
+<book xmlns="http://www.devhelp.net/book" title="JSON-GLib Reference Manual" link="index.html" author="" name="json-glib">
   <chapters>
     <sub name="JSON-GLib Overview" link="json-glib.html"/>
     <sub name="JSON-GLib Reference" link="json-base.html">
@@ -19,19 +19,32 @@
       </sub>
     </sub>
     <sub name="JSON-GLib Advanced API" link="json-advanced.html">
-      <sub name="GObject integration" link="json-glib-GObject-integration.html"/>
+      <sub name="GObject Serialization" link="json-glib-GObject-Serialization.html"/>
+      <sub name="Serializable Interface" link="json-glib-Serializable-Interface.html"/>
+      <sub name="Boxed Types Serialization" link="json-glib-Boxed-Types-Serialization.html"/>
     </sub>
     <sub name="JSON-GLib Additional Reference" link="json-tools.html">
       <sub name="Versioning information" link="json-glib-Versioning-information.html"/>
+      <sub name="Object Hierarchy" link="ch04.html"/>
     </sub>
     <sub name="Index" link="ix01.html"/>
-    <sub name="Index of new symbols in 0.4" link="ix02.html"/>
+    <sub name="Index of deprecated symbols" link="ix02.html"/>
+    <sub name="Index of new symbols in 0.4" link="ix03.html"/>
+    <sub name="Index of new symbols in 0.6" link="ix04.html"/>
+    <sub name="Index of new symbols in 0.8" link="ix05.html"/>
+    <sub name="Index of new symbols in 0.10" link="ix06.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
     <sub name="License" link="license.html"/>
   </chapters>
   <functions>
     <function name="enum JsonNodeType" link="json-glib-JSON-Node.html#JsonNodeType"/>
-    <function name="JSON_NODE_TYPE()" link="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS"/>
     <function name="JsonNode" link="json-glib-JSON-Node.html#JsonNode"/>
+    <function name="JSON_NODE_TYPE()" link="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS"/>
+    <function name="JSON_NODE_HOLDS()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS--CAPS"/>
+    <function name="JSON_NODE_HOLDS_VALUE()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-VALUE--CAPS"/>
+    <function name="JSON_NODE_HOLDS_OBJECT()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-OBJECT--CAPS"/>
+    <function name="JSON_NODE_HOLDS_ARRAY()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-ARRAY--CAPS"/>
+    <function name="JSON_NODE_HOLDS_NULL()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-NULL--CAPS"/>
     <function name="json_node_new ()" link="json-glib-JSON-Node.html#json-node-new"/>
     <function name="json_node_copy ()" link="json-glib-JSON-Node.html#json-node-copy"/>
     <function name="json_node_free ()" link="json-glib-JSON-Node.html#json-node-free"/>
@@ -54,6 +67,7 @@
     <function name="json_node_set_string ()" link="json-glib-JSON-Node.html#json-node-set-string"/>
     <function name="json_node_get_string ()" link="json-glib-JSON-Node.html#json-node-get-string"/>
     <function name="json_node_dup_string ()" link="json-glib-JSON-Node.html#json-node-dup-string"/>
+    <function name="json_node_set_parent ()" link="json-glib-JSON-Node.html#json-node-set-parent"/>
     <function name="json_node_get_parent ()" link="json-glib-JSON-Node.html#json-node-get-parent"/>
     <function name="json_node_type_name ()" link="json-glib-JSON-Node.html#json-node-type-name"/>
     <function name="json_node_get_value_type ()" link="json-glib-JSON-Node.html#json-node-get-value-type"/>
@@ -144,11 +158,25 @@
     <function name="The &quot;indent-char&quot; property" link="JsonGenerator.html#JsonGenerator--indent-char"/>
     <function name="The &quot;pretty&quot; property" link="JsonGenerator.html#JsonGenerator--pretty"/>
     <function name="The &quot;root&quot; property" link="JsonGenerator.html#JsonGenerator--root"/>
-    <function name="JsonSerializableIface" link="json-glib-GObject-integration.html#JsonSerializableIface"/>
-    <function name="json_serializable_serialize_property ()" link="json-glib-GObject-integration.html#json-serializable-serialize-property"/>
-    <function name="json_serializable_deserialize_property ()" link="json-glib-GObject-integration.html#json-serializable-deserialize-property"/>
-    <function name="json_serialize_gobject ()" link="json-glib-GObject-integration.html#json-serialize-gobject"/>
-    <function name="json_construct_gobject ()" link="json-glib-GObject-integration.html#json-construct-gobject"/>
+    <function name="json_gobject_serialize ()" link="json-glib-GObject-Serialization.html#json-gobject-serialize"/>
+    <function name="json_gobject_deserialize ()" link="json-glib-GObject-Serialization.html#json-gobject-deserialize"/>
+    <function name="json_gobject_to_data ()" link="json-glib-GObject-Serialization.html#json-gobject-to-data"/>
+    <function name="json_gobject_from_data ()" link="json-glib-GObject-Serialization.html#json-gobject-from-data"/>
+    <function name="json_construct_gobject ()" link="json-glib-GObject-Serialization.html#json-construct-gobject"/>
+    <function name="json_serialize_gobject ()" link="json-glib-GObject-Serialization.html#json-serialize-gobject"/>
+    <function name="JsonSerializableIface" link="json-glib-Serializable-Interface.html#JsonSerializableIface"/>
+    <function name="json_serializable_serialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-serialize-property"/>
+    <function name="json_serializable_deserialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-deserialize-property"/>
+    <function name="json_serializable_default_serialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-default-serialize-property"/>
+    <function name="json_serializable_default_deserialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-default-deserialize-property"/>
+    <function name="JsonBoxedSerializeFunc ()" link="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc"/>
+    <function name="JsonBoxedDeserializeFunc ()" link="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc"/>
+    <function name="json_boxed_register_serialize_func ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-register-serialize-func"/>
+    <function name="json_boxed_register_deserialize_func ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-register-deserialize-func"/>
+    <function name="json_boxed_can_serialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-can-serialize"/>
+    <function name="json_boxed_can_deserialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-can-deserialize"/>
+    <function name="json_boxed_serialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-serialize"/>
+    <function name="json_boxed_deserialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize"/>
     <function name="JSON_MAJOR_VERSION" link="json-glib-Versioning-information.html#JSON-MAJOR-VERSION--CAPS"/>
     <function name="JSON_MINOR_VERSION" link="json-glib-Versioning-information.html#JSON-MINOR-VERSION--CAPS"/>
     <function name="JSON_MICRO_VERSION" link="json-glib-Versioning-information.html#JSON-MICRO-VERSION--CAPS"/>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib.devhelp2 json-glib-0.10.2/doc/reference/html/json-glib.devhelp2
--- json-glib-0.7.6/doc/reference/html/json-glib.devhelp2	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib.devhelp2	2010-02-26 14:05:46.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="JSON-GLib 0.7.6&#10; Reference Manual" link="index.html" author="" name="json-glib" version="2" language="c">
+<book xmlns="http://www.devhelp.net/book" title="JSON-GLib Reference Manual" link="index.html" author="" name="json-glib" version="2" language="c">
   <chapters>
     <sub name="JSON-GLib Overview" link="json-glib.html"/>
     <sub name="JSON-GLib Reference" link="json-base.html">
@@ -19,19 +19,32 @@
       </sub>
     </sub>
     <sub name="JSON-GLib Advanced API" link="json-advanced.html">
-      <sub name="GObject integration" link="json-glib-GObject-integration.html"/>
+      <sub name="GObject Serialization" link="json-glib-GObject-Serialization.html"/>
+      <sub name="Serializable Interface" link="json-glib-Serializable-Interface.html"/>
+      <sub name="Boxed Types Serialization" link="json-glib-Boxed-Types-Serialization.html"/>
     </sub>
     <sub name="JSON-GLib Additional Reference" link="json-tools.html">
       <sub name="Versioning information" link="json-glib-Versioning-information.html"/>
+      <sub name="Object Hierarchy" link="ch04.html"/>
     </sub>
     <sub name="Index" link="ix01.html"/>
-    <sub name="Index of new symbols in 0.4" link="ix02.html"/>
+    <sub name="Index of deprecated symbols" link="ix02.html"/>
+    <sub name="Index of new symbols in 0.4" link="ix03.html"/>
+    <sub name="Index of new symbols in 0.6" link="ix04.html"/>
+    <sub name="Index of new symbols in 0.8" link="ix05.html"/>
+    <sub name="Index of new symbols in 0.10" link="ix06.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
     <sub name="License" link="license.html"/>
   </chapters>
   <functions>
     <keyword type="enum" name="enum JsonNodeType" link="json-glib-JSON-Node.html#JsonNodeType"/>
-    <keyword type="macro" name="JSON_NODE_TYPE()" link="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS"/>
     <keyword type="struct" name="JsonNode" link="json-glib-JSON-Node.html#JsonNode"/>
+    <keyword type="macro" name="JSON_NODE_TYPE()" link="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS"/>
+    <keyword type="macro" name="JSON_NODE_HOLDS()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS--CAPS" since="0.10"/>
+    <keyword type="macro" name="JSON_NODE_HOLDS_VALUE()" link="json-glib-JSON-Node.html#JSON-NODE-HOLDS-VALUE--CAPS" since="0.10"/>
+    <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_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"/>
@@ -54,6 +67,7 @@
     <keyword type="function" name="json_node_set_string ()" link="json-glib-JSON-Node.html#json-node-set-string"/>
     <keyword type="function" name="json_node_get_string ()" link="json-glib-JSON-Node.html#json-node-get-string"/>
     <keyword type="function" name="json_node_dup_string ()" link="json-glib-JSON-Node.html#json-node-dup-string"/>
+    <keyword type="function" name="json_node_set_parent ()" link="json-glib-JSON-Node.html#json-node-set-parent" since="0.8"/>
     <keyword type="function" name="json_node_get_parent ()" link="json-glib-JSON-Node.html#json-node-get-parent"/>
     <keyword type="function" name="json_node_type_name ()" link="json-glib-JSON-Node.html#json-node-type-name"/>
     <keyword type="function" name="json_node_get_value_type ()" link="json-glib-JSON-Node.html#json-node-get-value-type" since="0.4"/>
@@ -144,11 +158,25 @@
     <keyword type="property" name="The &quot;indent-char&quot; property" link="JsonGenerator.html#JsonGenerator--indent-char"/>
     <keyword type="property" name="The &quot;pretty&quot; property" link="JsonGenerator.html#JsonGenerator--pretty"/>
     <keyword type="property" name="The &quot;root&quot; property" link="JsonGenerator.html#JsonGenerator--root"/>
-    <keyword type="struct" name="JsonSerializableIface" link="json-glib-GObject-integration.html#JsonSerializableIface"/>
-    <keyword type="function" name="json_serializable_serialize_property ()" link="json-glib-GObject-integration.html#json-serializable-serialize-property"/>
-    <keyword type="function" name="json_serializable_deserialize_property ()" link="json-glib-GObject-integration.html#json-serializable-deserialize-property"/>
-    <keyword type="function" name="json_serialize_gobject ()" link="json-glib-GObject-integration.html#json-serialize-gobject"/>
-    <keyword type="function" name="json_construct_gobject ()" link="json-glib-GObject-integration.html#json-construct-gobject" since="0.4"/>
+    <keyword type="function" name="json_gobject_serialize ()" link="json-glib-GObject-Serialization.html#json-gobject-serialize" since="0.10"/>
+    <keyword type="function" name="json_gobject_deserialize ()" link="json-glib-GObject-Serialization.html#json-gobject-deserialize" since="0.10"/>
+    <keyword type="function" name="json_gobject_to_data ()" link="json-glib-GObject-Serialization.html#json-gobject-to-data" since="0.10"/>
+    <keyword type="function" name="json_gobject_from_data ()" link="json-glib-GObject-Serialization.html#json-gobject-from-data" since="0.10"/>
+    <keyword type="function" name="json_construct_gobject ()" link="json-glib-GObject-Serialization.html#json-construct-gobject" deprecated="0.10: Use json_gobject_from_data() instead" since="0.4"/>
+    <keyword type="function" name="json_serialize_gobject ()" link="json-glib-GObject-Serialization.html#json-serialize-gobject" deprecated="0.10: Use json_gobject_to_data() instead"/>
+    <keyword type="struct" name="JsonSerializableIface" link="json-glib-Serializable-Interface.html#JsonSerializableIface"/>
+    <keyword type="function" name="json_serializable_serialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-serialize-property"/>
+    <keyword type="function" name="json_serializable_deserialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-deserialize-property"/>
+    <keyword type="function" name="json_serializable_default_serialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-default-serialize-property" since="0.10"/>
+    <keyword type="function" name="json_serializable_default_deserialize_property ()" link="json-glib-Serializable-Interface.html#json-serializable-default-deserialize-property" since="0.10"/>
+    <keyword type="function" name="JsonBoxedSerializeFunc ()" link="json-glib-Boxed-Types-Serialization.html#JsonBoxedSerializeFunc" since="0.10"/>
+    <keyword type="function" name="JsonBoxedDeserializeFunc ()" link="json-glib-Boxed-Types-Serialization.html#JsonBoxedDeserializeFunc" since="0.10"/>
+    <keyword type="function" name="json_boxed_register_serialize_func ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-register-serialize-func" since="0.10"/>
+    <keyword type="function" name="json_boxed_register_deserialize_func ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-register-deserialize-func" since="0.10"/>
+    <keyword type="function" name="json_boxed_can_serialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-can-serialize" since="0.10"/>
+    <keyword type="function" name="json_boxed_can_deserialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-can-deserialize" since="0.10"/>
+    <keyword type="function" name="json_boxed_serialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-serialize" since="0.10"/>
+    <keyword type="function" name="json_boxed_deserialize ()" link="json-glib-Boxed-Types-Serialization.html#json-boxed-deserialize" since="0.10"/>
     <keyword type="macro" name="JSON_MAJOR_VERSION" link="json-glib-Versioning-information.html#JSON-MAJOR-VERSION--CAPS"/>
     <keyword type="macro" name="JSON_MINOR_VERSION" link="json-glib-Versioning-information.html#JSON-MINOR-VERSION--CAPS"/>
     <keyword type="macro" name="JSON_MICRO_VERSION" link="json-glib-Versioning-information.html#JSON-MICRO-VERSION--CAPS"/>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-GObject-integration.html json-glib-0.10.2/doc/reference/html/json-glib-GObject-integration.html
--- json-glib-0.7.6/doc/reference/html/json-glib-GObject-integration.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-GObject-integration.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,418 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GObject integration</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 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">
-<link rel="next" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
-<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
-<link rel="chapter" href="ch01.html" title="Data Types">
-<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
-<link rel="chapter" href="ch02.html" title="Parser">
-<link rel="chapter" href="ch03.html" title="Generator">
-<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
-<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
-<link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
-<link rel="appendix" href="license.html" title="Appendix A. License">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="json-advanced.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="json-advanced.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
-<td><a accesskey="n" href="json-tools.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#json-glib-GObject-integration.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#json-glib-GObject-integration.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="GObject integration">
-<a name="json-glib-GObject-integration"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="json-glib-GObject-integration.top_of_page"></a>GObject integration</span></h2>
-<p>GObject integration — Serialize and deserialize GObjects</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="json-glib-GObject-integration.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="json-glib-GObject-integration.html#JsonSerializableIface" title="JsonSerializableIface">JsonSerializableIface</a>;
-<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-GObject-integration.html#json-serializable-serialize-property" title="json_serializable_serialize_property ()">json_serializable_serialize_property</a>
-                                                        (JsonSerializable *serializable,
-                                                         const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *property_name,
-                                                         const <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
->GValue</a> *value,
-                                                         <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamSpec"
->GParamSpec</a> *pspec);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="json-glib-GObject-integration.html#json-serializable-deserialize-property" title="json_serializable_deserialize_property ()">json_serializable_deserialize_property</a>
-                                                        (JsonSerializable *serializable,
-                                                         const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *property_name,
-                                                         <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
->GValue</a> *value,
-                                                         <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamSpec"
->GParamSpec</a> *pspec,
-                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *property_node);
-
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *             <a class="link" href="json-glib-GObject-integration.html#json-serialize-gobject" title="json_serialize_gobject ()">json_serialize_gobject</a>              (<a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a> *gobject,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"
->gsize</a> *length);
-<a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a> *           <a class="link" href="json-glib-GObject-integration.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a>              (<a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"
->GType</a> gtype,
-                                                         const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *data,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"
->gsize</a> length,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="json-glib-GObject-integration.description"></a><h2>Description</h2>
-<p>
-JSON-GLib provides API for serializing and deserializing <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a>s
-to and from JSON data streams.
-</p>
-<p>
-Simple <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> classes can be (de)serialized into JSON objects, if the
-properties have compatible types with the native JSON types (integers,
-booleans, strings, string vectors). If the class to be (de)serialized has
-complex data types for properties (like boxed types or other objects)
-then the class should implement the provided <span class="type">JsonSerializable</span> interface
-and its virtual functions.</p>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="json-glib-GObject-integration.details"></a><h2>Details</h2>
-<div class="refsect2" title="JsonSerializableIface">
-<a name="JsonSerializableIface"></a><h3>JsonSerializableIface</h3>
-<pre class="programlisting">typedef struct {
-  JsonNode *(* serialize_property)   (JsonSerializable *serializable,
-                                      const gchar      *property_name,
-                                      const GValue     *value,
-                                      GParamSpec       *pspec);
-  gboolean  (* deserialize_property) (JsonSerializable *serializable,
-                                      const gchar      *property_name,
-                                      GValue           *value,
-                                      GParamSpec       *pspec,
-                                      JsonNode         *property_node);
-} JsonSerializableIface;
-</pre>
-<p>
-Interface that allows serializing and deserializing <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a>s
-with properties storing complex data types. The <a class="link" href="json-glib-GObject-integration.html#json-serialize-gobject" title="json_serialize_gobject ()"><code class="function">json_serialize_gobject()</code></a>
-function will check if the passed <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> implements this interface,
-so it can also be used to override the default property serialization
-sequence.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="structfield"><code>serialize_property</code></em> ()</span></p></td>
-<td> virtual function for serializing a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> property
-  into a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="structfield"><code>deserialize_property</code></em> ()</span></p></td>
-<td> virtual function for deserializing a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
-  into a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> property
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="json_serializable_serialize_property ()">
-<a name="json-serializable-serialize-property"></a><h3>json_serializable_serialize_property ()</h3>
-<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_serializable_serialize_property
-                                                        (JsonSerializable *serializable,
-                                                         const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *property_name,
-                                                         const <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
->GValue</a> *value,
-                                                         <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamSpec"
->GParamSpec</a> *pspec);</pre>
-<p>
-Asks a <span class="type">JsonSerializable</span> implementation to serialize a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a>
-property into a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> object.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
-<td> a <span class="type">JsonSerializable</span> object
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property_name</code></em> :</span></p></td>
-<td> the name of the property
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td> the value of the property
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>pspec</code></em> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamSpec"
-><span class="type">GParamSpec</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> containing the serialize property
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="json_serializable_deserialize_property ()">
-<a name="json-serializable-deserialize-property"></a><h3>json_serializable_deserialize_property ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            json_serializable_deserialize_property
-                                                        (JsonSerializable *serializable,
-                                                         const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *property_name,
-                                                         <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
->GValue</a> *value,
-                                                         <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamSpec"
->GParamSpec</a> *pspec,
-                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *property_node);</pre>
-<p>
-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>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
-<td> a <span class="type">JsonSerializable</span>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property_name</code></em> :</span></p></td>
-<td> the name of the property
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td> a pointer to an uninitialized <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
-><span class="type">GValue</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>pspec</code></em> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-GParamSpec.html#GParamSpec"
-><span class="type">GParamSpec</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property_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> containing the serialized property
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the property was successfully deserialized.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="json_serialize_gobject ()">
-<a name="json-serialize-gobject"></a><h3>json_serialize_gobject ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *             json_serialize_gobject              (<a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a> *gobject,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"
->gsize</a> *length);</pre>
-<p>
-Serializes a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> into a JSON data stream. If <em class="parameter"><code>gobject</code></em> implements
-the <a class="link" href="json-glib-GObject-integration.html#JsonSerializableIface" title="JsonSerializableIface"><span class="type">JsonSerializableIface</span></a> interface, it will be asked to serizalize all
-its properties; otherwise, the default implementation will be use to
-translate the compatible types into JSON native types.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gobject</code></em> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
-<td> return value for the length of the buffer, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a JSON data stream representing the passed <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="json_construct_gobject ()">
-<a name="json-construct-gobject"></a><h3>json_construct_gobject ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a> *           json_construct_gobject              (<a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"
->GType</a> gtype,
-                                                         const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *data,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"
->gsize</a> length,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
-<p>
-Deserializes a JSON data stream and creates the corresponding
-<a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> class. If <em class="parameter"><code>gtype</code></em> implements the <a class="link" href="json-glib-GObject-integration.html#JsonSerializableIface" title="JsonSerializableIface"><span class="type">JsonSerializableIface</span></a>
-interface, it will be asked to deserialize all the JSON members
-into the respective properties; otherwise, the default implementation
-will be used to translate the compatible JSON native types.
-</p>
-<p>
-Note: the JSON data stream must be an object declaration.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td> the <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"
-><span class="type">GType</span></a> of object to construct
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td> a JSON data stream
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
-<td> length of the data stream, or -1 if it is NUL-terminated
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> return location for a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
-
-</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.4</p>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.11</div>
-</body>
-</html>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-GObject-Serialization.html json-glib-0.10.2/doc/reference/html/json-glib-GObject-Serialization.html
--- json-glib-0.7.6/doc/reference/html/json-glib-GObject-Serialization.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-GObject-Serialization.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,456 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GObject Serialization</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
+<link rel="next" href="json-glib-Serializable-Interface.html" title="Serializable Interface">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="json-advanced.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="json-advanced.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="json-glib-Serializable-Interface.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#json-glib-GObject-Serialization.synopsis" class="shortcut">Top</a>
+                 | 
+                <a href="#json-glib-GObject-Serialization.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="GObject Serialization">
+<a name="json-glib-GObject-Serialization"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="json-glib-GObject-Serialization.top_of_page"></a>GObject Serialization</span></h2>
+<p>GObject Serialization — Serialize and deserialize GObjects</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="json-glib-GObject-Serialization.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-serialize" title="json_gobject_serialize ()">json_gobject_serialize</a>              (<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *gobject);
+<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *           <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-deserialize" title="json_gobject_deserialize ()">json_gobject_deserialize</a>            (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gtype,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
+<a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *             <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-to-data" title="json_gobject_to_data ()">json_gobject_to_data</a>                (<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *gobject,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gsize"
+>gsize</a> *length);
+<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *           <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-from-data" title="json_gobject_from_data ()">json_gobject_from_data</a>              (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gtype,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *data,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gssize"
+>gssize</a> length,
+                                                         <a
+href="../glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);
+
+<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *           <a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()">json_construct_gobject</a>              (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gtype,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *data,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gsize"
+>gsize</a> length,
+                                                         <a
+href="../glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);
+<a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *             <a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()">json_serialize_gobject</a>              (<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *gobject,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gsize"
+>gsize</a> *length);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="json-glib-GObject-Serialization.description"></a><h2>Description</h2>
+<p>
+JSON-GLib provides API for serializing and deserializing <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>s
+to and from JSON data streams.
+</p>
+<p>
+Simple <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> classes can be (de)serialized into JSON objects, if the
+properties have compatible types with the native JSON types (integers,
+booleans, strings, string vectors). If the class to be (de)serialized has
+complex data types for properties (like boxed types or other objects)
+then the class should implement the provided <span class="type">JsonSerializable</span> interface
+and its virtual functions.</p>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="json-glib-GObject-Serialization.details"></a><h2>Details</h2>
+<div class="refsect2" title="json_gobject_serialize ()">
+<a name="json-gobject-serialize"></a><h3>json_gobject_serialize ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_gobject_serialize              (<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *gobject);</pre>
+<p>
+Creates a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> representing the passed <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>
+instance. Each member of the returned JSON object will
+map to a property of the <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a></p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gobject</code></em> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>transfer full. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_gobject_deserialize ()">
+<a name="json-gobject-deserialize"></a><h3>json_gobject_deserialize ()</h3>
+<pre class="programlisting"><a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *           json_gobject_deserialize            (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gtype,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
+<p>
+Creates a new <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> of type <em class="parameter"><code>gtype</code></em>, and constructs it
+using the members of the passed <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a></p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
+<td> the type of the <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> to create
+</td>
+</tr>
+<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-OBJECT--CAPS"><code class="literal">JSON_NODE_OBJECT</code></a> describing the
+  instance of type <em class="parameter"><code>gtype</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>transfer full. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_gobject_to_data ()">
+<a name="json-gobject-to-data"></a><h3>json_gobject_to_data ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *             json_gobject_to_data                (<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *gobject,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gsize"
+>gsize</a> *length);</pre>
+<p>
+Serializes a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> into a JSON data stream, iterating recursively
+over each property.
+</p>
+<p>
+If <em class="parameter"><code>gobject</code></em> implements the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="JsonSerializableIface"><span class="type">JsonSerializableIface</span></a> interface, it will
+be asked to serialize all its properties; otherwise, the default
+implementation will be use to translate the compatible types into
+JSON native types.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gobject</code></em> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
+<td> return value for the length of the buffer, or <code class="literal">NULL</code>. <acronym title="Parameter for returning results. Default is transfer-full."><span class="acronym">out</span></acronym>. </td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a JSON data stream representing the passed <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_gobject_from_data ()">
+<a name="json-gobject-from-data"></a><h3>json_gobject_from_data ()</h3>
+<pre class="programlisting"><a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *           json_gobject_from_data              (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gtype,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *data,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gssize"
+>gssize</a> length,
+                                                         <a
+href="../glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);</pre>
+<p>
+Deserializes a JSON data stream and creates the corresponding
+<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> class. If <em class="parameter"><code>gtype</code></em> implements the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="JsonSerializableIface"><span class="type">JsonSerializableIface</span></a>
+interface, it will be asked to deserialize all the JSON members
+into the respective properties; otherwise, the default implementation
+will be used to translate the compatible JSON native types.
+</p>
+<p>
+Note: the JSON data stream must be an object declaration.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
+<td> the <a
+href="../gobject/gobject-Type-Information.html#GType"
+><span class="type">GType</span></a> of object to construct
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
+<td> a JSON data stream
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
+<td> length of the data stream, or -1 if it is NUL-terminated
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td> return location for a <a
+href="../glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a>, or <code class="literal">NULL</code>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> or <code class="literal">NULL</code>
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_construct_gobject ()">
+<a name="json-construct-gobject"></a><h3>json_construct_gobject ()</h3>
+<pre class="programlisting"><a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *           json_construct_gobject              (<a
+href="../gobject/gobject-Type-Information.html#GType"
+>GType</a> gtype,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *data,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gsize"
+>gsize</a> length,
+                                                         <a
+href="../glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">json_construct_gobject</code> has been deprecated since version 0.10 and should not be used in newly-written code. Use <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-from-data" title="json_gobject_from_data ()"><code class="function">json_gobject_from_data()</code></a> instead</p>
+</div>
+<p>
+Deserializes a JSON data stream and creates the corresponding
+<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> class. If <em class="parameter"><code>gtype</code></em> implements the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="JsonSerializableIface"><span class="type">JsonSerializableIface</span></a>
+interface, it will be asked to deserialize all the JSON members
+into the respective properties; otherwise, the default implementation
+will be used to translate the compatible JSON native types.
+</p>
+<p>
+Note: the JSON data stream must be an object declaration.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
+<td> the <a
+href="../gobject/gobject-Type-Information.html#GType"
+><span class="type">GType</span></a> of object to construct
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
+<td> a JSON data stream
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
+<td> length of the data stream
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td> return location for a <a
+href="../glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a>, or <code class="literal">NULL</code>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> or <code class="literal">NULL</code>
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.4</p>
+</div>
+<hr>
+<div class="refsect2" title="json_serialize_gobject ()">
+<a name="json-serialize-gobject"></a><h3>json_serialize_gobject ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *             json_serialize_gobject              (<a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+>GObject</a> *gobject,
+                                                         <a
+href="../glib/glib-Basic-Types.html#gsize"
+>gsize</a> *length);</pre>
+<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">json_serialize_gobject</code> has been deprecated since version 0.10 and should not be used in newly-written code. Use <a class="link" href="json-glib-GObject-Serialization.html#json-gobject-to-data" title="json_gobject_to_data ()"><code class="function">json_gobject_to_data()</code></a> instead</p>
+</div>
+<p>
+Serializes a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> into a JSON data stream. If <em class="parameter"><code>gobject</code></em> implements
+the <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="JsonSerializableIface"><span class="type">JsonSerializableIface</span></a> interface, it will be asked to serizalize all
+its properties; otherwise, the default implementation will be use to
+translate the compatible types into JSON native types.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gobject</code></em> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
+<td> return value for the length of the buffer, or <code class="literal">NULL</code>. <acronym title="Parameter for returning results. Default is transfer-full."><span class="acronym">out</span></acronym>. </td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a JSON data stream representing the passed <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>
+
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib.html json-glib-0.10.2/doc/reference/html/json-glib.html
--- json-glib-0.7.6/doc/reference/html/json-glib.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib.html	2010-02-26 14:05:46.000000000 +0000
@@ -3,10 +3,10 @@
 <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.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="prev" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="json-base.html" title="Part II. JSON-GLib Reference">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,8 +33,7 @@
 <td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="json-base.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part" title="Part I. JSON-GLib Overview">
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-JSON-Array.html json-glib-0.10.2/doc/reference/html/json-glib-JSON-Array.html
--- json-glib-0.7.6/doc/reference/html/json-glib-JSON-Array.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-JSON-Array.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>JSON Array</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="json-glib-JSON-Object.html" title="JSON Object">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,8 +34,7 @@
 <td><a accesskey="p" href="json-glib-JSON-Node.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="json-glib-JSON-Object.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
@@ -53,7 +58,7 @@
                     <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a>;
 <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         <a class="link" href="json-glib-JSON-Array.html#json-array-new" title="json_array_new ()">json_array_new</a>                      (void);
 <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         <a class="link" href="json-glib-JSON-Array.html#json-array-sized-new" title="json_array_sized_new ()">json_array_sized_new</a>                (<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> n_elements);
 <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         <a class="link" href="json-glib-JSON-Array.html#json-array-ref" title="json_array_ref ()">json_array_ref</a>                      (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-unref" title="json_array_unref ()">json_array_unref</a>                    (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array);
@@ -62,94 +67,94 @@
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-JSON-Array.html#json-array-get-element" title="json_array_get_element ()">json_array_get_element</a>              (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-JSON-Array.html#json-array-dup-element" title="json_array_dup_element ()">json_array_dup_element</a>              (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
+href="../glib/glib-Doubly-Linked-Lists.html#GList"
 >GList</a> *             <a class="link" href="json-glib-JSON-Array.html#json-array-get-elements" title="json_array_get_elements ()">json_array_get_elements</a>             (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               <a class="link" href="json-glib-JSON-Array.html#json-array-get-length" title="json_array_get_length ()">json_array_get_length</a>               (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-remove-element" title="json_array_remove_element ()">json_array_remove_element</a>           (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 void                (<a class="link" href="json-glib-JSON-Array.html#JsonArrayForeach" title="JsonArrayForeach ()">*JsonArrayForeach</a>)                 (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *element_node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> user_data);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-foreach-element" title="json_array_foreach_element ()">json_array_foreach_element</a>          (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a class="link" href="json-glib-JSON-Array.html#JsonArrayForeach" title="JsonArrayForeach ()">JsonArrayForeach</a> func,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> data);
 
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-add-array-element" title="json_array_add_array_element ()">json_array_add_array_element</a>        (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *value);
 <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         <a class="link" href="json-glib-JSON-Array.html#json-array-get-array-element" title="json_array_get_array_element ()">json_array_get_array_element</a>        (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-add-boolean-element" title="json_array_add_boolean_element ()">json_array_add_boolean_element</a>      (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="json-glib-JSON-Array.html#json-array-get-boolean-element" title="json_array_get_boolean_element ()">json_array_get_boolean_element</a>      (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-add-double-element" title="json_array_add_double_element ()">json_array_add_double_element</a>       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a>             <a class="link" href="json-glib-JSON-Array.html#json-array-get-double-element" title="json_array_get_double_element ()">json_array_get_double_element</a>       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-add-int-element" title="json_array_add_int_element ()">json_array_add_int_element</a>          (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a>              <a class="link" href="json-glib-JSON-Array.html#json-array-get-int-element" title="json_array_get_int_element ()">json_array_get_int_element</a>          (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-add-null-element" title="json_array_add_null_element ()">json_array_add_null_element</a>         (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="json-glib-JSON-Array.html#json-array-get-null-element" title="json_array_get_null_element ()">json_array_get_null_element</a>         (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-add-object-element" title="json_array_add_object_element ()">json_array_add_object_element</a>       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *value);
 <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *        <a class="link" href="json-glib-JSON-Array.html#json-array-get-object-element" title="json_array_get_object_element ()">json_array_get_object_element</a>       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 void                <a class="link" href="json-glib-JSON-Array.html#json-array-add-string-element" title="json_array_add_string_element ()">json_array_add_string_element</a>       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *value);
 const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       <a class="link" href="json-glib-JSON-Array.html#json-array-get-string-element" title="json_array_get_string_element ()">json_array_get_string_element</a>       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);
 </pre>
 </div>
@@ -204,7 +209,7 @@
 <div class="refsect2" title="json_array_sized_new ()">
 <a name="json-array-sized-new"></a><h3>json_array_sized_new ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         json_array_sized_new                (<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> n_elements);</pre>
 <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>
@@ -301,7 +306,7 @@
 <a name="json-array-get-element"></a><h3>json_array_get_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_array_get_element              (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 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>
@@ -334,7 +339,7 @@
 <a name="json-array-dup-element"></a><h3>json_array_dup_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_array_dup_element              (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 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
@@ -356,10 +361,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a copy of the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> at the requested index.
-  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> when done.
-
-</td>
+<td>transfer full. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
 </tr>
 </tbody>
 </table></div>
@@ -369,7 +371,7 @@
 <div class="refsect2" title="json_array_get_elements ()">
 <a name="json-array-get-elements"></a><h3>json_array_get_elements ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
+href="../glib/glib-Doubly-Linked-Lists.html#GList"
 >GList</a> *             json_array_get_elements             (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array);</pre>
 <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>
@@ -385,15 +387,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
-><span class="type">GList</span></a> containing the elements of the array. The
-  contents of the list are owned by the array and should never be
-  modified or freed. Use <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"
-><code class="function">g_list_free()</code></a> on the returned list when
-  done using it
-</td>
+<td>element-type JsonNode) (transfer container. <acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> JsonNode. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> container. </td>
 </tr>
 </tbody>
 </table></div>
@@ -402,7 +396,7 @@
 <div class="refsect2" title="json_array_get_length ()">
 <a name="json-array-get-length"></a><h3>json_array_get_length ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               json_array_get_length               (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array);</pre>
 <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>
@@ -429,7 +423,7 @@
 <a name="json-array-remove-element"></a><h3>json_array_remove_element ()</h3>
 <pre class="programlisting">void                json_array_remove_element           (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 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
@@ -457,11 +451,11 @@
 <a name="JsonArrayForeach"></a><h3>JsonArrayForeach ()</h3>
 <pre class="programlisting">void                (*JsonArrayForeach)                 (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *element_node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> user_data);</pre>
 <p>
 The function to be passed to <a class="link" href="json-glib-JSON-Array.html#json-array-foreach-element" title="json_array_foreach_element ()"><code class="function">json_array_foreach_element()</code></a>. You
@@ -502,7 +496,7 @@
 <pre class="programlisting">void                json_array_foreach_element          (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a class="link" href="json-glib-JSON-Array.html#JsonArrayForeach" title="JsonArrayForeach ()">JsonArrayForeach</a> func,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> data);</pre>
 <p>
 Iterates over all elements of <em class="parameter"><code>array</code></em> and calls <em class="parameter"><code>func</code></em> on
@@ -529,8 +523,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td> data to be passed to the function
-</td>
+<td> data to be passed to the function. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=allow-none"><span class="acronym">allow-none</span></a>. </td>
 </tr>
 </tbody>
 </table></div>
@@ -571,7 +564,7 @@
 <a name="json-array-get-array-element"></a><h3>json_array_get_array_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         json_array_get_array_element        (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 Conveniently retrieves the array from the element at <em class="parameter"><code>index_</code></em>
@@ -596,9 +589,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the array
-
-</td>
+<td> the array. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> none. </td>
 </tr>
 </tbody>
 </table></div>
@@ -609,7 +600,7 @@
 <a name="json-array-add-boolean-element"></a><h3>json_array_add_boolean_element ()</h3>
 <pre class="programlisting">void                json_array_add_boolean_element      (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a> value);</pre>
 <p>
 Conveniently adds a boolean <em class="parameter"><code>value</code></em> into <em class="parameter"><code>array</code></em>
@@ -639,10 +630,10 @@
 <div class="refsect2" title="json_array_get_boolean_element ()">
 <a name="json-array-get-boolean-element"></a><h3>json_array_get_boolean_element ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_array_get_boolean_element      (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 Conveniently retrieves the boolean value of the element at <em class="parameter"><code>index_</code></em>
@@ -680,7 +671,7 @@
 <a name="json-array-add-double-element"></a><h3>json_array_add_double_element ()</h3>
 <pre class="programlisting">void                json_array_add_double_element       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a> value);</pre>
 <p>
 Conveniently adds a floating point <em class="parameter"><code>value</code></em> into <em class="parameter"><code>array</code></em>
@@ -710,10 +701,10 @@
 <div class="refsect2" title="json_array_get_double_element ()">
 <a name="json-array-get-double-element"></a><h3>json_array_get_double_element ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a>             json_array_get_double_element       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 Conveniently retrieves the floating point value of the element at
@@ -751,7 +742,7 @@
 <a name="json-array-add-int-element"></a><h3>json_array_add_int_element ()</h3>
 <pre class="programlisting">void                json_array_add_int_element          (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a> value);</pre>
 <p>
 Conveniently adds an integer <em class="parameter"><code>value</code></em> into <em class="parameter"><code>array</code></em>
@@ -781,10 +772,10 @@
 <div class="refsect2" title="json_array_get_int_element ()">
 <a name="json-array-get-int-element"></a><h3>json_array_get_int_element ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a>              json_array_get_int_element          (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 Conveniently retrieves the integer value of the element at <em class="parameter"><code>index_</code></em>
@@ -842,10 +833,10 @@
 <div class="refsect2" title="json_array_get_null_element ()">
 <a name="json-array-get-null-element"></a><h3>json_array_get_null_element ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_array_get_null_element         (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 Conveniently retrieves whether the element at <em class="parameter"><code>index_</code></em> is set to null
@@ -869,9 +860,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the element is null
+<td> <code class="literal">TRUE</code> if the element is null
 
 </td>
 </tr>
@@ -914,7 +903,7 @@
 <a name="json-array-get-object-element"></a><h3>json_array_get_object_element ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *        json_array_get_object_element       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 Conveniently retrieves the object from the element at <em class="parameter"><code>index_</code></em>
@@ -939,9 +928,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the object
-
-</td>
+<td> the object. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> none. </td>
 </tr>
 </tbody>
 </table></div>
@@ -952,7 +939,7 @@
 <a name="json-array-add-string-element"></a><h3>json_array_add_string_element ()</h3>
 <pre class="programlisting">void                json_array_add_string_element       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *value);</pre>
 <p>
 Conveniently adds a string <em class="parameter"><code>value</code></em> into <em class="parameter"><code>array</code></em>
@@ -982,10 +969,10 @@
 <div class="refsect2" title="json_array_get_string_element ()">
 <a name="json-array-get-string-element"></a><h3>json_array_get_string_element ()</h3>
 <pre class="programlisting">const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       json_array_get_string_element       (<a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *array,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a> index_);</pre>
 <p>
 Conveniently retrieves the string value of the element at <em class="parameter"><code>index_</code></em>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-JSON-Node.html json-glib-0.10.2/doc/reference/html/json-glib-JSON-Node.html
--- json-glib-0.7.6/doc/reference/html/json-glib-JSON-Node.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-JSON-Node.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>JSON Node</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="json-glib-JSON-Array.html" title="JSON Array">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,8 +34,7 @@
 <td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="json-glib-JSON-Array.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
@@ -51,8 +56,13 @@
 <a name="json-glib-JSON-Node.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
 enum                <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a>;
-#define             <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS" title="JSON_NODE_TYPE()">JSON_NODE_TYPE</a>                      (node)
                     <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a>;
+#define             <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS" title="JSON_NODE_TYPE()">JSON_NODE_TYPE</a>                      (node)
+#define             <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS--CAPS" title="JSON_NODE_HOLDS()">JSON_NODE_HOLDS</a>                     (node,t)
+#define             <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-HOLDS-VALUE--CAPS" title="JSON_NODE_HOLDS_VALUE()">JSON_NODE_HOLDS_VALUE</a>               (node)
+#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">JsonNode</a> *          <a class="link" href="json-glib-JSON-Node.html#json-node-new" title="json_node_new ()">json_node_new</a>                       (<a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a> type);
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-JSON-Node.html#json-node-copy" title="json_node_copy ()">json_node_copy</a>                      (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 void                <a class="link" href="json-glib-JSON-Node.html#json-node-free" title="json_node_free ()">json_node_free</a>                      (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
@@ -73,54 +83,56 @@
 
 void                <a class="link" href="json-glib-JSON-Node.html#json-node-set-value" title="json_node_set_value ()">json_node_set_value</a>                 (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          const <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 >GValue</a> *value);
 void                <a class="link" href="json-glib-JSON-Node.html#json-node-get-value" title="json_node_get_value ()">json_node_get_value</a>                 (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 >GValue</a> *value);
 void                <a class="link" href="json-glib-JSON-Node.html#json-node-set-boolean" title="json_node_set_boolean ()">json_node_set_boolean</a>               (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="json-glib-JSON-Node.html#json-node-get-boolean" title="json_node_get_boolean ()">json_node_get_boolean</a>               (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 void                <a class="link" href="json-glib-JSON-Node.html#json-node-set-double" title="json_node_set_double ()">json_node_set_double</a>                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a>             <a class="link" href="json-glib-JSON-Node.html#json-node-get-double" title="json_node_get_double ()">json_node_get_double</a>                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 void                <a class="link" href="json-glib-JSON-Node.html#json-node-set-int" title="json_node_set_int ()">json_node_set_int</a>                   (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a>              <a class="link" href="json-glib-JSON-Node.html#json-node-get-int" title="json_node_get_int ()">json_node_get_int</a>                   (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 void                <a class="link" href="json-glib-JSON-Node.html#json-node-set-string" title="json_node_set_string ()">json_node_set_string</a>                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *value);
 const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       <a class="link" href="json-glib-JSON-Node.html#json-node-get-string" title="json_node_get_string ()">json_node_get_string</a>                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *             <a class="link" href="json-glib-JSON-Node.html#json-node-dup-string" title="json_node_dup_string ()">json_node_dup_string</a>                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 
+void                <a class="link" href="json-glib-JSON-Node.html#json-node-set-parent" title="json_node_set_parent ()">json_node_set_parent</a>                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *parent);
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-JSON-Node.html#json-node-get-parent" title="json_node_get_parent ()">json_node_get_parent</a>                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       <a class="link" href="json-glib-JSON-Node.html#json-node-type-name" title="json_node_type_name ()">json_node_type_name</a>                 (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"
+href="../gobject/gobject-Type-Information.html#GType"
 >GType</a>               <a class="link" href="json-glib-JSON-Node.html#json-node-get-value-type" title="json_node_get_value_type ()">json_node_get_value_type</a>            (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType">JsonNodeType</a>        <a class="link" href="json-glib-JSON-Node.html#json-node-get-node-type" title="json_node_get_node_type ()">json_node_get_node_type</a>             (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="json-glib-JSON-Node.html#json-node-is-null" title="json_node_is_null ()">json_node_is_null</a>                   (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 </pre>
 </div>
@@ -136,10 +148,10 @@
 the node tree by retrieving the type of data contained inside the
 node with the <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-TYPE--CAPS" title="JSON_NODE_TYPE()"><code class="literal">JSON_NODE_TYPE</code></a> macro. If the node contains a fundamental
 type you can retrieve a copy of the <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 ><span class="type">GValue</span></a> holding it with the
 <a class="link" href="json-glib-JSON-Node.html#json-node-get-value" title="json_node_get_value ()"><code class="function">json_node_get_value()</code></a> function, and then use the <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 ><span class="type">GValue</span></a> API to extract
 the data; if the node contains a complex type you can retrieve the
 <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> or the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> using <a class="link" href="json-glib-JSON-Node.html#json-node-get-object" title="json_node_get_object ()"><code class="function">json_node_get_object()</code></a> or
@@ -190,6 +202,21 @@
 </table></div>
 </div>
 <hr>
+<div class="refsect2" title="JsonNode">
+<a name="JsonNode"></a><h3>JsonNode</h3>
+<pre class="programlisting">typedef struct _JsonNode JsonNode;</pre>
+<p>
+A generic container of JSON data types. The contents of the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+structure are private and should only be accessed via the provided
+functions and never directly.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody></tbody>
+</table></div>
+</div>
+<hr>
 <div class="refsect2" title="JSON_NODE_TYPE()">
 <a name="JSON-NODE-TYPE--CAPS"></a><h3>JSON_NODE_TYPE()</h3>
 <pre class="programlisting">#define JSON_NODE_TYPE(node)    (json_node_get_node_type ((node)))
@@ -208,19 +235,106 @@
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="JsonNode">
-<a name="JsonNode"></a><h3>JsonNode</h3>
-<pre class="programlisting">typedef struct _JsonNode JsonNode;</pre>
+<div class="refsect2" title="JSON_NODE_HOLDS()">
+<a name="JSON-NODE-HOLDS--CAPS"></a><h3>JSON_NODE_HOLDS()</h3>
+<pre class="programlisting">#define JSON_NODE_HOLDS(node,t)         (json_node_get_node_type ((node)) == (t))
+</pre>
 <p>
-A generic container of JSON data types. The contents of the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
-structure are private and should only be accessed via the provided
-functions and never directly.</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>
 <p>
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<tbody></tbody>
+<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>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>t</code></em> :</span></p></td>
+<td> a <a class="link" href="json-glib-JSON-Node.html#JsonNodeType" title="enum JsonNodeType"><span class="type">JsonNodeType</span></a>
+</td>
+</tr>
+</tbody>
 </table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="JSON_NODE_HOLDS_VALUE()">
+<a name="JSON-NODE-HOLDS-VALUE--CAPS"></a><h3>JSON_NODE_HOLDS_VALUE()</h3>
+<pre class="programlisting">#define JSON_NODE_HOLDS_VALUE(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_VALUE))
+</pre>
+<p>
+Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em> holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-VALUE--CAPS"><code class="literal">JSON_NODE_VALUE</code></a></p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<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>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="JSON_NODE_HOLDS_OBJECT()">
+<a name="JSON-NODE-HOLDS-OBJECT--CAPS"></a><h3>JSON_NODE_HOLDS_OBJECT()</h3>
+<pre class="programlisting">#define JSON_NODE_HOLDS_OBJECT(node)    (JSON_NODE_HOLDS ((node), JSON_NODE_OBJECT))
+</pre>
+<p>
+Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em> holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-OBJECT--CAPS"><code class="literal">JSON_NODE_OBJECT</code></a></p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<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>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="JSON_NODE_HOLDS_ARRAY()">
+<a name="JSON-NODE-HOLDS-ARRAY--CAPS"></a><h3>JSON_NODE_HOLDS_ARRAY()</h3>
+<pre class="programlisting">#define JSON_NODE_HOLDS_ARRAY(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_ARRAY))
+</pre>
+<p>
+Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em> holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-ARRAY--CAPS"><code class="literal">JSON_NODE_ARRAY</code></a></p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<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>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="JSON_NODE_HOLDS_NULL()">
+<a name="JSON-NODE-HOLDS-NULL--CAPS"></a><h3>JSON_NODE_HOLDS_NULL()</h3>
+<pre class="programlisting">#define JSON_NODE_HOLDS_NULL(node)      (JSON_NODE_HOLDS ((node), JSON_NODE_NULL))
+</pre>
+<p>
+Evaluates to <code class="literal">TRUE</code> if <em class="parameter"><code>node</code></em> holds a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL--CAPS"><code class="literal">JSON_NODE_NULL</code></a></p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<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>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.10</p>
 </div>
 <hr>
 <div class="refsect2" title="json_node_new ()">
@@ -265,8 +379,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the copied <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
-</td>
+<td> the copied <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
 </tr>
 </tbody>
 </table></div>
@@ -356,8 +469,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>
-</td>
+<td> the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a>. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> none. </td>
 </tr>
 </tbody>
 </table></div>
@@ -381,8 +493,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> with its reference count increased.
-</td>
+<td>transfer full. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
 </tr>
 </tbody>
 </table></div>
@@ -455,8 +566,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>
-</td>
+<td> the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> none. </td>
 </tr>
 </tbody>
 </table></div>
@@ -480,8 +590,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>
-</td>
+<td> the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
 </tr>
 </tbody>
 </table></div>
@@ -491,11 +600,11 @@
 <a name="json-node-set-value"></a><h3>json_node_set_value ()</h3>
 <pre class="programlisting">void                json_node_set_value                 (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          const <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 >GValue</a> *value);</pre>
 <p>
 Sets <em class="parameter"><code>value</code></em> inside <em class="parameter"><code>node</code></em>. The passed <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 ><span class="type">GValue</span></a> is copied into the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a></p>
 <p>
 </p>
@@ -510,7 +619,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
 <td> the <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 ><span class="type">GValue</span></a> to set
 </td>
 </tr>
@@ -522,14 +631,14 @@
 <a name="json-node-get-value"></a><h3>json_node_get_value ()</h3>
 <pre class="programlisting">void                json_node_get_value                 (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 >GValue</a> *value);</pre>
 <p>
 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 <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset"
+href="../gobject/gobject-Generic-values.html#g-value-unset"
 ><code class="function">g_value_unset()</code></a> on the <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"
+href="../gobject/gobject-Generic-values.html#GValue"
 ><span class="type">GValue</span></a>.</p>
 <p>
 </p>
@@ -554,7 +663,7 @@
 <a name="json-node-set-boolean"></a><h3>json_node_set_boolean ()</h3>
 <pre class="programlisting">void                json_node_set_boolean               (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a> value);</pre>
 <p>
 Sets <em class="parameter"><code>value</code></em> as the boolean content of the <em class="parameter"><code>node</code></em>, replacing any existing
@@ -581,7 +690,7 @@
 <div class="refsect2" title="json_node_get_boolean ()">
 <a name="json-node-get-boolean"></a><h3>json_node_get_boolean ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_node_get_boolean               (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <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>
@@ -608,7 +717,7 @@
 <a name="json-node-set-double"></a><h3>json_node_set_double ()</h3>
 <pre class="programlisting">void                json_node_set_double                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a> value);</pre>
 <p>
 Sets <em class="parameter"><code>value</code></em> as the double content of the <em class="parameter"><code>node</code></em>, replacing any existing
@@ -635,7 +744,7 @@
 <div class="refsect2" title="json_node_get_double ()">
 <a name="json-node-get-double"></a><h3>json_node_get_double ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a>             json_node_get_double                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <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>
@@ -662,7 +771,7 @@
 <a name="json-node-set-int"></a><h3>json_node_set_int ()</h3>
 <pre class="programlisting">void                json_node_set_int                   (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a> value);</pre>
 <p>
 Sets <em class="parameter"><code>value</code></em> as the integer content of the <em class="parameter"><code>node</code></em>, replacing any existing
@@ -689,7 +798,7 @@
 <div class="refsect2" title="json_node_get_int ()">
 <a name="json-node-get-int"></a><h3>json_node_get_int ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a>              json_node_get_int                   (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <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>
@@ -716,7 +825,7 @@
 <a name="json-node-set-string"></a><h3>json_node_set_string ()</h3>
 <pre class="programlisting">void                json_node_set_string                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *value);</pre>
 <p>
 Sets <em class="parameter"><code>value</code></em> as the string content of the <em class="parameter"><code>node</code></em>, replacing any existing
@@ -743,7 +852,7 @@
 <div class="refsect2" title="json_node_get_string ()">
 <a name="json-node-get-string"></a><h3>json_node_get_string ()</h3>
 <pre class="programlisting">const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       json_node_get_string                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <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>
@@ -769,7 +878,7 @@
 <div class="refsect2" title="json_node_dup_string ()">
 <a name="json-node-dup-string"></a><h3>json_node_dup_string ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *             json_node_dup_string                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <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>
@@ -785,12 +894,36 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly allocated string containing a copy of
-  the <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> contents
+<td>transfer full. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="json_node_set_parent ()">
+<a name="json-node-set-parent"></a><h3>json_node_set_parent ()</h3>
+<pre class="programlisting">void                json_node_set_parent                (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *parent);</pre>
+<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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<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>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
+<td> 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>
 </td>
 </tr>
 </tbody>
 </table></div>
+<p class="since">Since 0.8</p>
 </div>
 <hr>
 <div class="refsect2" title="json_node_get_parent ()">
@@ -810,9 +943,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the parent node, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if <em class="parameter"><code>node</code></em> is the root node
+<td> the parent node, or <code class="literal">NULL</code> if <em class="parameter"><code>node</code></em> is the root node
 </td>
 </tr>
 </tbody>
@@ -822,7 +953,7 @@
 <div class="refsect2" title="json_node_type_name ()">
 <a name="json-node-type-name"></a><h3>json_node_type_name ()</h3>
 <pre class="programlisting">const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       json_node_type_name                 (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <p>
 Retrieves the user readable name of the data type contained by <em class="parameter"><code>node</code></em>.</p>
@@ -849,11 +980,11 @@
 <div class="refsect2" title="json_node_get_value_type ()">
 <a name="json-node-get-value-type"></a><h3>json_node_get_value_type ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"
+href="../gobject/gobject-Type-Information.html#GType"
 >GType</a>               json_node_get_value_type            (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <p>
 Returns the <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"
+href="../gobject/gobject-Type-Information.html#GType"
 ><span class="type">GType</span></a> of the payload of the node.</p>
 <p>
 </p>
@@ -868,7 +999,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"
+href="../gobject/gobject-Type-Information.html#GType"
 ><span class="type">GType</span></a> for the payload.
 
 </td>
@@ -907,7 +1038,7 @@
 <div class="refsect2" title="json_node_is_null ()">
 <a name="json-node-is-null"></a><h3>json_node_is_null ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_node_is_null                   (<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <p>
 Checks whether <em class="parameter"><code>node</code></em> is a <a class="link" href="json-glib-JSON-Node.html#JSON-NODE-NULL--CAPS"><code class="literal">JSON_NODE_NULL</code></a>
@@ -915,9 +1046,7 @@
 <p>
 </p>
 <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>A null node is not the same as a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+<h3 class="title">Note</h3>A null node is not the same as a <code class="literal">NULL</code><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
 </div>
 <p>
 </p>
@@ -931,9 +1060,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the node is null
+<td> <code class="literal">TRUE</code> if the node is null
 
 </td>
 </tr>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-JSON-Object.html json-glib-0.10.2/doc/reference/html/json-glib-JSON-Object.html
--- json-glib-0.7.6/doc/reference/html/json-glib-JSON-Object.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-JSON-Object.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>JSON Object</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="json-streams.html" title="Part III. Reading and writing">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,8 +34,7 @@
 <td><a accesskey="p" href="json-glib-JSON-Array.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="json-streams.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
@@ -57,134 +62,134 @@
 
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-add-member" title="json_object_add_member ()">json_object_add_member</a>              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-member" title="json_object_set_member ()">json_object_set_member</a>              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="json-glib-JSON-Object.html#json-object-has-member" title="json_object_has_member ()">json_object_has_member</a>              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-JSON-Object.html#json-object-get-member" title="json_object_get_member ()">json_object_get_member</a>              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-JSON-Object.html#json-object-dup-member" title="json_object_dup_member ()">json_object_dup_member</a>              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
+href="../glib/glib-Doubly-Linked-Lists.html#GList"
 >GList</a> *             <a class="link" href="json-glib-JSON-Object.html#json-object-get-members" title="json_object_get_members ()">json_object_get_members</a>             (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
+href="../glib/glib-Doubly-Linked-Lists.html#GList"
 >GList</a> *             <a class="link" href="json-glib-JSON-Object.html#json-object-get-values" title="json_object_get_values ()">json_object_get_values</a>              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               <a class="link" href="json-glib-JSON-Object.html#json-object-get-size" title="json_object_get_size ()">json_object_get_size</a>                (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-remove-member" title="json_object_remove_member ()">json_object_remove_member</a>           (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 void                (<a class="link" href="json-glib-JSON-Object.html#JsonObjectForeach" title="JsonObjectForeach ()">*JsonObjectForeach</a>)                (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *member_node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> user_data);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-foreach-member" title="json_object_foreach_member ()">json_object_foreach_member</a>          (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          <a class="link" href="json-glib-JSON-Object.html#JsonObjectForeach" title="JsonObjectForeach ()">JsonObjectForeach</a> func,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> data);
 
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-array-member" title="json_object_set_array_member ()">json_object_set_array_member</a>        (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *value);
 <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         <a class="link" href="json-glib-JSON-Object.html#json-object-get-array-member" title="json_object_get_array_member ()">json_object_get_array_member</a>        (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-boolean-member" title="json_object_set_boolean_member ()">json_object_set_boolean_member</a>      (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="json-glib-JSON-Object.html#json-object-get-boolean-member" title="json_object_get_boolean_member ()">json_object_get_boolean_member</a>      (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-double-member" title="json_object_set_double_member ()">json_object_set_double_member</a>       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a>             <a class="link" href="json-glib-JSON-Object.html#json-object-get-double-member" title="json_object_get_double_member ()">json_object_get_double_member</a>       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-int-member" title="json_object_set_int_member ()">json_object_set_int_member</a>          (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a> value);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a>              <a class="link" href="json-glib-JSON-Object.html#json-object-get-int-member" title="json_object_get_int_member ()">json_object_get_int_member</a>          (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-null-member" title="json_object_set_null_member ()">json_object_set_null_member</a>         (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="json-glib-JSON-Object.html#json-object-get-null-member" title="json_object_get_null_member ()">json_object_get_null_member</a>         (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-object-member" title="json_object_set_object_member ()">json_object_set_object_member</a>       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *value);
 <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *        <a class="link" href="json-glib-JSON-Object.html#json-object-get-object-member" title="json_object_get_object_member ()">json_object_get_object_member</a>       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 void                <a class="link" href="json-glib-JSON-Object.html#json-object-set-string-member" title="json_object_set_string_member ()">json_object_set_string_member</a>       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *value);
 const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       <a class="link" href="json-glib-JSON-Object.html#json-object-get-string-member" title="json_object_get_string_member ()">json_object_get_string_member</a>       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);
 </pre>
 </div>
@@ -193,11 +198,7 @@
 <p>
 <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray"><span class="type">JsonArray</span></a> is the representation of the object type inside JSON. It contains
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>s, which may contain fundamental types, arrays or other
-objects. Each member of an object is accessed using its name. Please note
-that the member names are normalized internally before being used; every
-delimiter matching the <code class="literal">G_STR_DELIMITER</code> macro will be transformed into an
-underscore, so for instance "member-name" and "member_name" are equivalent
-for a <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a>.
+objects. Each member of an object is accessed using its name.
 </p>
 <p>
 Since objects can be expensive, they are reference counted. You can control
@@ -289,7 +290,7 @@
 <a name="json-object-add-member"></a><h3>json_object_add_member ()</h3>
 <pre class="programlisting">void                json_object_add_member              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -331,7 +332,7 @@
 <a name="json-object-set-member"></a><h3>json_object_set_member ()</h3>
 <pre class="programlisting">void                json_object_set_member              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *node);</pre>
 <p>
@@ -369,10 +370,10 @@
 <div class="refsect2" title="json_object_has_member ()">
 <a name="json-object-has-member"></a><h3>json_object_has_member ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_object_has_member              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Checks whether <em class="parameter"><code>object</code></em> has a member named <em class="parameter"><code>member_name</code></em>.</p>
@@ -393,9 +394,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the JSON object has the requested member
+<td> <code class="literal">TRUE</code> if the JSON object has the requested member
 </td>
 </tr>
 </tbody>
@@ -406,7 +405,7 @@
 <a name="json-object-get-member"></a><h3>json_object_get_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_object_get_member              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 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
@@ -429,9 +428,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a pointer to the node for the requested object
-  member, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+  member, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
@@ -442,7 +439,7 @@
 <a name="json-object-dup-member"></a><h3>json_object_dup_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_object_dup_member              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 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>
@@ -464,10 +461,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a copy of the node for the requested object member
-  or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>. Use <a class="link" href="json-glib-JSON-Node.html#json-node-free" title="json_node_free ()"><code class="function">json_node_free()</code></a> when done.
+<td> (transfer full) a copy of the node for the requested
+  object member or <code class="literal">NULL</code>. Use <a class="link" href="json-glib-JSON-Node.html#json-node-free" title="json_node_free ()"><code class="function">json_node_free()</code></a> when done.
 
 </td>
 </tr>
@@ -479,7 +474,7 @@
 <div class="refsect2" title="json_object_get_members ()">
 <a name="json-object-get-members"></a><h3>json_object_get_members ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
+href="../glib/glib-Doubly-Linked-Lists.html#GList"
 >GList</a> *             json_object_get_members             (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object);</pre>
 <p>
 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
@@ -496,15 +491,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
-><span class="type">GList</span></a> of member names. The content of the list
-  is owned by the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> and should never be modified or
-  freed. When you have finished using the returned list, use
-  <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"
-><code class="function">g_list_free()</code></a> to free the resources it has allocated.
-</td>
+<td>element-type utf8) (transfer container. <acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> container. </td>
 </tr>
 </tbody>
 </table></div>
@@ -513,7 +500,7 @@
 <div class="refsect2" title="json_object_get_values ()">
 <a name="json-object-get-values"></a><h3>json_object_get_values ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
+href="../glib/glib-Doubly-Linked-Lists.html#GList"
 >GList</a> *             json_object_get_values              (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object);</pre>
 <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>
@@ -529,15 +516,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
-><span class="type">GList</span></a> of <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>s. The content of the
-  list is owned by the <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject"><span class="type">JsonObject</span></a> and should never be modified
-  or freed. When you have finished using the returned list, use
-  <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"
-><code class="function">g_list_free()</code></a> to free the resources it has allocated.
-</td>
+<td>element-type JsonNode) (transfer container. <acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> JsonNode. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> container. </td>
 </tr>
 </tbody>
 </table></div>
@@ -546,7 +525,7 @@
 <div class="refsect2" title="json_object_get_size ()">
 <a name="json-object-get-size"></a><h3>json_object_get_size ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               json_object_get_size                (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object);</pre>
 <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>
@@ -573,7 +552,7 @@
 <a name="json-object-remove-member"></a><h3>json_object_remove_member ()</h3>
 <pre class="programlisting">void                json_object_remove_member           (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Removes <em class="parameter"><code>member_name</code></em> from <em class="parameter"><code>object</code></em>, freeing its allocated resources.</p>
@@ -600,11 +579,11 @@
 <a name="JsonObjectForeach"></a><h3>JsonObjectForeach ()</h3>
 <pre class="programlisting">void                (*JsonObjectForeach)                (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *member_node,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> user_data);</pre>
 <p>
 The function to be passed to <a class="link" href="json-glib-JSON-Object.html#json-object-foreach-member" title="json_object_foreach_member ()"><code class="function">json_object_foreach_member()</code></a>. You
@@ -645,7 +624,7 @@
 <pre class="programlisting">void                json_object_foreach_member          (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          <a class="link" href="json-glib-JSON-Object.html#JsonObjectForeach" title="JsonObjectForeach ()">JsonObjectForeach</a> func,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a> data);</pre>
 <p>
 Iterates over all members of <em class="parameter"><code>object</code></em> and calls <em class="parameter"><code>func</code></em> on
@@ -684,7 +663,7 @@
 <a name="json-object-set-array-member"></a><h3>json_object_set_array_member ()</h3>
 <pre class="programlisting">void                json_object_set_array_member        (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *value);</pre>
 <p>
@@ -725,7 +704,7 @@
 <a name="json-object-get-array-member"></a><h3>json_object_get_array_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a> *         json_object_get_array_member        (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function that retrieves the array
@@ -750,9 +729,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the array inside the object's member
-
-</td>
+<td> the array inside the object's member. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> none. </td>
 </tr>
 </tbody>
 </table></div>
@@ -763,10 +740,10 @@
 <a name="json-object-set-boolean-member"></a><h3>json_object_set_boolean_member ()</h3>
 <pre class="programlisting">void                json_object_set_boolean_member      (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a> value);</pre>
 <p>
 Convenience function for setting a boolean <em class="parameter"><code>value</code></em> of
@@ -802,10 +779,10 @@
 <div class="refsect2" title="json_object_get_boolean_member ()">
 <a name="json-object-get-boolean-member"></a><h3>json_object_get_boolean_member ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_object_get_boolean_member      (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function that retrieves the boolean value
@@ -843,10 +820,10 @@
 <a name="json-object-set-double-member"></a><h3>json_object_set_double_member ()</h3>
 <pre class="programlisting">void                json_object_set_double_member       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a> value);</pre>
 <p>
 Convenience function for setting a floating point <em class="parameter"><code>value</code></em>
@@ -882,10 +859,10 @@
 <div class="refsect2" title="json_object_get_double_member ()">
 <a name="json-object-get-double-member"></a><h3>json_object_get_double_member ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
+href="../glib/glib-Basic-Types.html#gdouble"
 >gdouble</a>             json_object_get_double_member       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function that retrieves the floating point value
@@ -923,10 +900,10 @@
 <a name="json-object-set-int-member"></a><h3>json_object_set_int_member ()</h3>
 <pre class="programlisting">void                json_object_set_int_member          (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a> value);</pre>
 <p>
 Convenience function for setting an integer <em class="parameter"><code>value</code></em> of
@@ -962,10 +939,10 @@
 <div class="refsect2" title="json_object_get_int_member ()">
 <a name="json-object-get-int-member"></a><h3>json_object_get_int_member ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"
+href="../glib/glib-Basic-Types.html#gint64"
 >gint64</a>              json_object_get_int_member          (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function that retrieves the integer value
@@ -1003,7 +980,7 @@
 <a name="json-object-set-null-member"></a><h3>json_object_set_null_member ()</h3>
 <pre class="programlisting">void                json_object_set_null_member         (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function for setting a null <em class="parameter"><code>value</code></em> of
@@ -1034,10 +1011,10 @@
 <div class="refsect2" title="json_object_get_null_member ()">
 <a name="json-object-get-null-member"></a><h3>json_object_get_null_member ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_object_get_null_member         (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function that checks whether the value
@@ -1062,9 +1039,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the value is null
+<td> <code class="literal">TRUE</code> if the value is null
 
 </td>
 </tr>
@@ -1077,7 +1052,7 @@
 <a name="json-object-set-object-member"></a><h3>json_object_set_object_member ()</h3>
 <pre class="programlisting">void                json_object_set_object_member       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *value);</pre>
 <p>
@@ -1118,7 +1093,7 @@
 <a name="json-object-get-object-member"></a><h3>json_object_get_object_member ()</h3>
 <pre class="programlisting"><a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *        json_object_get_object_member       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function that retrieves the object
@@ -1143,9 +1118,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the object inside the object's member
-
-</td>
+<td> the object inside the object's member. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> none. </td>
 </tr>
 </tbody>
 </table></div>
@@ -1156,10 +1129,10 @@
 <a name="json-object-set-string-member"></a><h3>json_object_set_string_member ()</h3>
 <pre class="programlisting">void                json_object_set_string_member       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *value);</pre>
 <p>
 Convenience function for setting a string <em class="parameter"><code>value</code></em> of
@@ -1195,10 +1168,10 @@
 <div class="refsect2" title="json_object_get_string_member ()">
 <a name="json-object-get-string-member"></a><h3>json_object_get_string_member ()</h3>
 <pre class="programlisting">const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *       json_object_get_string_member       (<a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *member_name);</pre>
 <p>
 Convenience function that retrieves the string value
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-Serializable-Interface.html json-glib-0.10.2/doc/reference/html/json-glib-Serializable-Interface.html
--- json-glib-0.7.6/doc/reference/html/json-glib-Serializable-Interface.html	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-Serializable-Interface.html	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,445 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Serializable Interface</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
+<link rel="next" href="json-glib-Boxed-Types-Serialization.html" title="Boxed Types Serialization">
+<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
+<link rel="part" href="json-base.html" title="Part II. JSON-GLib Reference">
+<link rel="chapter" href="ch01.html" title="Data Types">
+<link rel="part" href="json-streams.html" title="Part III. Reading and writing">
+<link rel="chapter" href="ch02.html" title="Parser">
+<link rel="chapter" href="ch03.html" title="Generator">
+<link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
+<link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
+<link rel="index" href="ix01.html" title="Index">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
+<link rel="appendix" href="license.html" title="Appendix A. License">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="json-glib-GObject-Serialization.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="json-advanced.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="json-glib-Boxed-Types-Serialization.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#json-glib-Serializable-Interface.synopsis" class="shortcut">Top</a>
+                 | 
+                <a href="#json-glib-Serializable-Interface.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry" title="Serializable Interface">
+<a name="json-glib-Serializable-Interface"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="json-glib-Serializable-Interface.top_of_page"></a>Serializable Interface</span></h2>
+<p>Serializable Interface — Interface for serialize and deserialize special GObjects</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="json-glib-Serializable-Interface.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">
+                    <a class="link" href="json-glib-Serializable-Interface.html#JsonSerializableIface" title="JsonSerializableIface">JsonSerializableIface</a>;
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-serialize-property" title="json_serializable_serialize_property ()">json_serializable_serialize_property</a>
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         const <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec);
+<a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-deserialize-property" title="json_serializable_deserialize_property ()">json_serializable_deserialize_property</a>
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *property_node);
+
+<a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-default-serialize-property" title="json_serializable_default_serialize_property ()">json_serializable_default_serialize_property</a>
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         const <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec);
+<a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            <a class="link" href="json-glib-Serializable-Interface.html#json-serializable-default-deserialize-property" title="json_serializable_default_deserialize_property ()">json_serializable_default_deserialize_property</a>
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *property_node);
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="json-glib-Serializable-Interface.description"></a><h2>Description</h2>
+<p>
+<span class="type">JsonSerializable</span> is an interface for <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> classes that
+allows controlling how the class is going to be serialized
+or deserialized by <a class="link" href="json-glib-GObject-Serialization.html#json-construct-gobject" title="json_construct_gobject ()"><code class="function">json_construct_gobject()</code></a> and
+<a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()"><code class="function">json_serialize_gobject()</code></a> respectively.</p>
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="json-glib-Serializable-Interface.details"></a><h2>Details</h2>
+<div class="refsect2" title="JsonSerializableIface">
+<a name="JsonSerializableIface"></a><h3>JsonSerializableIface</h3>
+<pre class="programlisting">typedef struct {
+  JsonNode *(* serialize_property)   (JsonSerializable *serializable,
+                                      const gchar      *property_name,
+                                      const GValue     *value,
+                                      GParamSpec       *pspec);
+  gboolean  (* deserialize_property) (JsonSerializable *serializable,
+                                      const gchar      *property_name,
+                                      GValue           *value,
+                                      GParamSpec       *pspec,
+                                      JsonNode         *property_node);
+} JsonSerializableIface;
+</pre>
+<p>
+Interface that allows serializing and deserializing <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>s
+with properties storing complex data types. The <a class="link" href="json-glib-GObject-Serialization.html#json-serialize-gobject" title="json_serialize_gobject ()"><code class="function">json_serialize_gobject()</code></a>
+function will check if the passed <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> implements this interface,
+so it can also be used to override the default property serialization
+sequence.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="structfield"><code>serialize_property</code></em> ()</span></p></td>
+<td> virtual function for serializing a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> property
+  into a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="structfield"><code>deserialize_property</code></em> ()</span></p></td>
+<td> virtual function for deserializing a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a>
+  into a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a> property
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="json_serializable_serialize_property ()">
+<a name="json-serializable-serialize-property"></a><h3>json_serializable_serialize_property ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_serializable_serialize_property
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         const <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec);</pre>
+<p>
+Asks a <span class="type">JsonSerializable</span> implementation to serialize a <a
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
+><span class="type">GObject</span></a>
+property into a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> object.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
+<td> a <span class="type">JsonSerializable</span> object
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property_name</code></em> :</span></p></td>
+<td> the name of the property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td> the value of the property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>pspec</code></em> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+><span class="type">GParamSpec</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> containing the serialized property
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="json_serializable_deserialize_property ()">
+<a name="json-serializable-deserialize-property"></a><h3>json_serializable_deserialize_property ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            json_serializable_deserialize_property
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *property_node);</pre>
+<p>
+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>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
+<td> a <span class="type">JsonSerializable</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property_name</code></em> :</span></p></td>
+<td> the name of the property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td> a pointer to an uninitialized <a
+href="../gobject/gobject-Generic-values.html#GValue"
+><span class="type">GValue</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>pspec</code></em> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+><span class="type">GParamSpec</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property_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> containing the serialized property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> <code class="literal">TRUE</code> if the property was successfully deserialized.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="json_serializable_default_serialize_property ()">
+<a name="json-serializable-default-serialize-property"></a><h3>json_serializable_default_serialize_property ()</h3>
+<pre class="programlisting"><a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          json_serializable_default_serialize_property
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         const <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec);</pre>
+<p>
+Calls the default implementation of the <span class="type">JsonSerializable</span>
+<code class="function">serialize_property()</code> virtual function
+</p>
+<p>
+This function can be used inside a custom implementation
+of the <code class="function">serialize_property()</code> virtual function in lieu of:
+</p>
+<p>
+</p>
+<div class="informalexample"><pre class="programlisting">
+  JsonSerializable *iface;
+  JsonNode *node;
+
+  iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+  node = iface-&gt;serialize_property (serializable, property_name,
+                                    value,
+                                    pspec);
+</pre></div>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
+<td> a <span class="type">JsonSerializable</span> object
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property_name</code></em> :</span></p></td>
+<td> the name of the property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td> the value of the property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>pspec</code></em> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+><span class="type">GParamSpec</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>transfer full. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> full. </td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+<hr>
+<div class="refsect2" title="json_serializable_default_deserialize_property ()">
+<a name="json-serializable-default-deserialize-property"></a><h3>json_serializable_default_deserialize_property ()</h3>
+<pre class="programlisting"><a
+href="../glib/glib-Basic-Types.html#gboolean"
+>gboolean</a>            json_serializable_default_deserialize_property
+                                                        (JsonSerializable *serializable,
+                                                         const <a
+href="../glib/glib-Basic-Types.html#gchar"
+>gchar</a> *property_name,
+                                                         <a
+href="../gobject/gobject-Generic-values.html#GValue"
+>GValue</a> *value,
+                                                         <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+>GParamSpec</a> *pspec,
+                                                         <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *property_node);</pre>
+<p>
+Calls the default implementation of the <span class="type">JsonSerializable</span>
+<code class="function">deserialize_property()</code> virtual function
+</p>
+<p>
+This function can be used inside a custom implementation
+of the <code class="function">deserialize_property()</code> virtual function in lieu of:
+</p>
+<p>
+</p>
+<div class="informalexample"><pre class="programlisting">
+  JsonSerializable *iface;
+  gboolean res;
+
+  iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+  res = iface-&gt;deserialize_property (serializable, property_name,
+                                     value,
+                                     pspec,
+                                     property_node);
+</pre></div>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>serializable</code></em> :</span></p></td>
+<td> a <span class="type">JsonSerializable</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property_name</code></em> :</span></p></td>
+<td> the name of the property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td> a pointer to an uninitialized <a
+href="../gobject/gobject-Generic-values.html#GValue"
+><span class="type">GValue</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>pspec</code></em> :</span></p></td>
+<td> a <a
+href="../gobject/gobject-GParamSpec.html#GParamSpec"
+><span class="type">GParamSpec</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>property_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> containing the serialized property
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> <code class="literal">TRUE</code> if the property was successfully deserialized.
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.10</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.11</div>
+</body>
+</html>
diff -Nru json-glib-0.7.6/doc/reference/html/json-glib-Versioning-information.html json-glib-0.10.2/doc/reference/html/json-glib-Versioning-information.html
--- json-glib-0.7.6/doc/reference/html/json-glib-Versioning-information.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-glib-Versioning-information.html	2010-02-26 14:05:46.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Versioning information</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
-<link rel="next" href="ix01.html" title="Index">
+<link rel="next" href="ch04.html" title="Object Hierarchy">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,9 +34,8 @@
 <td><a accesskey="p" href="json-tools.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="json-tools.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
-<td><a accesskey="n" href="ix01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
+<td><a accesskey="n" href="ch04.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#json-glib-Versioning-information.synopsis" class="shortcut">Top</a>
@@ -83,7 +88,7 @@
 <hr>
 <div class="refsect2" title="JSON_MINOR_VERSION">
 <a name="JSON-MINOR-VERSION--CAPS"></a><h3>JSON_MINOR_VERSION</h3>
-<pre class="programlisting">#define JSON_MINOR_VERSION              (7)
+<pre class="programlisting">#define JSON_MINOR_VERSION              (10)
 </pre>
 <p>
 Json minor version component (e.g. 2 if <a class="link" href="json-glib-Versioning-information.html#JSON-VERSION--CAPS" title="JSON_VERSION"><code class="literal">JSON_VERSION</code></a> is 1.2.3)</p>
@@ -93,7 +98,7 @@
 <hr>
 <div class="refsect2" title="JSON_MICRO_VERSION">
 <a name="JSON-MICRO-VERSION--CAPS"></a><h3>JSON_MICRO_VERSION</h3>
-<pre class="programlisting">#define JSON_MICRO_VERSION              (6)
+<pre class="programlisting">#define JSON_MICRO_VERSION              (2)
 </pre>
 <p>
 Json micro version component (e.g. 3 if <a class="link" href="json-glib-Versioning-information.html#JSON-VERSION--CAPS" title="JSON_VERSION"><code class="literal">JSON_VERSION</code></a> is 1.2.3)</p>
@@ -103,7 +108,7 @@
 <hr>
 <div class="refsect2" title="JSON_VERSION">
 <a name="JSON-VERSION--CAPS"></a><h3>JSON_VERSION</h3>
-<pre class="programlisting">#define JSON_VERSION                    (0.7.6)
+<pre class="programlisting">#define JSON_VERSION                    (0.10.2)
 </pre>
 <p>
 Json version.</p>
@@ -113,7 +118,7 @@
 <hr>
 <div class="refsect2" title="JSON_VERSION_S">
 <a name="JSON-VERSION-S--CAPS"></a><h3>JSON_VERSION_S</h3>
-<pre class="programlisting">#define JSON_VERSION_S                  "0.7.6"
+<pre class="programlisting">#define JSON_VERSION_S                  "0.10.2"
 </pre>
 <p>
 Json version, encoded as a string, useful for printing and
@@ -136,9 +141,7 @@
 <a name="JSON-CHECK-VERSION--CAPS"></a><h3>JSON_CHECK_VERSION()</h3>
 <pre class="programlisting">#define             JSON_CHECK_VERSION(major,minor,micro)</pre>
 <p>
-Compile-time version checking. Evaluates to <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the version
+Compile-time version checking. Evaluates to <code class="literal">TRUE</code> if the version
 of Json is greater than the required one.</p>
 <p>
 </p>
diff -Nru json-glib-0.7.6/doc/reference/html/JsonParser.html json-glib-0.10.2/doc/reference/html/JsonParser.html
--- json-glib-0.7.6/doc/reference/html/JsonParser.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/JsonParser.html	2010-04-13 12:00:33.000000000 +0100
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>JsonParser</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="ch03.html" title="Generator">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,8 +34,7 @@
 <td><a accesskey="p" href="ch02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="ch03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
@@ -60,40 +65,40 @@
                     <a class="link" href="JsonParser.html#JsonParserClass" title="JsonParserClass">JsonParserClass</a>;
 <a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *        <a class="link" href="JsonParser.html#json-parser-new" title="json_parser_new ()">json_parser_new</a>                     (void);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="JsonParser.html#json-parser-load-from-file" title="json_parser_load_from_file ()">json_parser_load_from_file</a>          (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *filename,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
+href="../glib/glib-Error-Reporting.html#GError"
 >GError</a> **error);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="JsonParser.html#json-parser-load-from-data" title="json_parser_load_from_data ()">json_parser_load_from_data</a>          (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *data,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"
+href="../glib/glib-Basic-Types.html#gssize"
 >gssize</a> length,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
+href="../glib/glib-Error-Reporting.html#GError"
 >GError</a> **error);
 
 <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode">JsonNode</a> *          <a class="link" href="JsonParser.html#json-parser-get-root" title="json_parser_get_root ()">json_parser_get_root</a>                (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser);
 
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               <a class="link" href="JsonParser.html#json-parser-get-current-line" title="json_parser_get_current_line ()">json_parser_get_current_line</a>        (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               <a class="link" href="JsonParser.html#json-parser-get-current-pos" title="json_parser_get_current_pos ()">json_parser_get_current_pos</a>         (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser);
 <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            <a class="link" href="JsonParser.html#json-parser-has-assignment" title="json_parser_has_assignment ()">json_parser_has_assignment</a>          (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> **variable_name);
 </pre>
 </div>
@@ -101,7 +106,7 @@
 <a name="JsonParser.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
+href="../gobject/gobject-The-Base-Object-Type.html#GObject"
 >GObject</a>
    +----JsonParser
 </pre>
@@ -264,7 +269,7 @@
 <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 <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"
+href="../gobject/gobject-The-Base-Object-Type.html#g-object-unref"
 ><code class="function">g_object_unref()</code></a>
   to release all the memory it allocates.
 </td>
@@ -275,13 +280,13 @@
 <div class="refsect2" title="json_parser_load_from_file ()">
 <a name="json-parser-load-from-file"></a><h3>json_parser_load_from_file ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_parser_load_from_file          (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *filename,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
+href="../glib/glib-Error-Reporting.html#GError"
 >GError</a> **error);</pre>
 <p>
 Loads a JSON stream from the content of <em class="parameter"><code>filename</code></em> and parses it. See
@@ -304,20 +309,14 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td> return location for a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+href="../glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a>, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the file was successfully loaded and parsed.
-  In case of error, <em class="parameter"><code>error</code></em> is set accordingly and <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> is returned
+<td> <code class="literal">TRUE</code> if the file was successfully loaded and parsed.
+  In case of error, <em class="parameter"><code>error</code></em> is set accordingly and <code class="literal">FALSE</code> is returned
 </td>
 </tr>
 </tbody>
@@ -327,16 +326,16 @@
 <div class="refsect2" title="json_parser_load_from_data ()">
 <a name="json-parser-load-from-data"></a><h3>json_parser_load_from_data ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_parser_load_from_data          (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                          const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> *data,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"
+href="../glib/glib-Basic-Types.html#gssize"
 >gssize</a> length,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
+href="../glib/glib-Error-Reporting.html#GError"
 >GError</a> **error);</pre>
 <p>
 Loads a JSON stream from a buffer and parses it. You can call this function
@@ -365,20 +364,14 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td> return location for a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+href="../glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a>, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the buffer was succesfully parser. In case
-  of error, <em class="parameter"><code>error</code></em> is set accordingly and <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> is returned
+<td> <code class="literal">TRUE</code> if the buffer was succesfully parser. In case
+  of error, <em class="parameter"><code>error</code></em> is set accordingly and <code class="literal">FALSE</code> is returned
 </td>
 </tr>
 </tbody>
@@ -402,9 +395,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the root <a class="link" href="json-glib-JSON-Node.html#JsonNode" title="JsonNode"><span class="type">JsonNode</span></a> . The returned node is owned by
-  the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> and should never be modified or freed.
-</td>
+<td>transfer none. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=transfer"><span class="acronym">transfer</span></a> none. </td>
 </tr>
 </tbody>
 </table></div>
@@ -413,7 +404,7 @@
 <div class="refsect2" title="json_parser_get_current_line ()">
 <a name="json-parser-get-current-line"></a><h3>json_parser_get_current_line ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               json_parser_get_current_line        (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser);</pre>
 <p>
 Retrieves the line currently parsed, starting from 1.
@@ -444,7 +435,7 @@
 <div class="refsect2" title="json_parser_get_current_pos ()">
 <a name="json-parser-get-current-pos"></a><h3>json_parser_get_current_pos ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
+href="../glib/glib-Basic-Types.html#guint"
 >guint</a>               json_parser_get_current_pos         (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser);</pre>
 <p>
 Retrieves the current position inside the current line, starting
@@ -476,10 +467,10 @@
 <div class="refsect2" title="json_parser_has_assignment ()">
 <a name="json-parser-has-assignment"></a><h3>json_parser_has_assignment ()</h3>
 <pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
+href="../glib/glib-Basic-Types.html#gboolean"
 >gboolean</a>            json_parser_has_assignment          (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                          <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a> **variable_name);</pre>
 <p>
 A JSON data stream might sometimes contain an assignment, like:
@@ -511,21 +502,12 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>variable_name</code></em> :</span></p></td>
-<td> return location for the variable name, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
-</td>
+<td>out) (allow-none. <acronym title="Parameter for returning results. Default is transfer-full."><span class="acronym">out</span></acronym>. <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=allow-none"><span class="acronym">allow-none</span></a>. </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if there was an assignment, <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise. If
-  <em class="parameter"><code>variable_name</code></em> is not <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> it will be set to the name of the variable
+<td> <code class="literal">TRUE</code> if there was an assignment, <code class="literal">FALSE</code> otherwise. If
+  <em class="parameter"><code>variable_name</code></em> is not <code class="literal">NULL</code> it will be set to the name of the variable
   used in the assignment. The string is owned by <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> and should
   never be modified or freed.
 
@@ -543,10 +525,10 @@
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a>  *array,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"
+href="../glib/glib-Basic-Types.html#gint"
 >gint</a>        index_,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::array-element signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
@@ -585,7 +567,7 @@
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a class="link" href="json-glib-JSON-Array.html#JsonArray" title="JsonArray">JsonArray</a>  *array,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::array-end signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
@@ -617,7 +599,7 @@
 <a name="JsonParser-array-start"></a><h3>The <code class="literal">"array-start"</code> signal</h3>
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::array-start signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
@@ -644,10 +626,10 @@
 <a name="JsonParser-error"></a><h3>The <code class="literal">"error"</code> signal</h3>
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    error,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::error signal is emitted each time a <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a> encounters
@@ -665,7 +647,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td> a pointer to the <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
+href="../glib/glib-Error-Reporting.html#GError"
 ><span class="type">GError</span></a>
 </td>
 </tr>
@@ -682,7 +664,7 @@
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::object-end signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
@@ -715,10 +697,10 @@
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a class="link" href="json-glib-JSON-Object.html#JsonObject" title="JsonObject">JsonObject</a> *object,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
+href="../glib/glib-Basic-Types.html#gchar"
 >gchar</a>      *member_name,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)        : Run Last</pre>
 <p>
 The ::object-member signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
@@ -756,7 +738,7 @@
 <a name="JsonParser-object-start"></a><h3>The <code class="literal">"object-start"</code> signal</h3>
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::object-start signal is emitted each time the <a class="link" href="JsonParser.html" title="JsonParser"><span class="type">JsonParser</span></a>
@@ -783,7 +765,7 @@
 <a name="JsonParser-parse-end"></a><h3>The <code class="literal">"parse-end"</code> signal</h3>
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::parse-end signal is emitted when the parser successfully
@@ -810,7 +792,7 @@
 <a name="JsonParser-parse-start"></a><h3>The <code class="literal">"parse-start"</code> signal</h3>
 <pre class="programlisting">void                user_function                      (<a class="link" href="JsonParser.html" title="JsonParser">JsonParser</a> *parser,
                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
+href="../glib/glib-Basic-Types.html#gpointer"
 >gpointer</a>    user_data)      : Run Last</pre>
 <p>
 The ::parse-start signal is emitted when the parser began parsing
diff -Nru json-glib-0.7.6/doc/reference/html/json-streams.html json-glib-0.10.2/doc/reference/html/json-streams.html
--- json-glib-0.7.6/doc/reference/html/json-streams.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-streams.html	2010-02-26 14:05:46.000000000 +0000
@@ -3,9 +3,9 @@
 <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.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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">
 <link rel="next" href="ch02.html" title="Parser">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
@@ -18,8 +18,14 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,8 +33,7 @@
 <td><a accesskey="p" href="json-glib-JSON-Object.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="ch02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part" title="Part III. Reading and writing">
diff -Nru json-glib-0.7.6/doc/reference/html/json-tools.html json-glib-0.10.2/doc/reference/html/json-tools.html
--- json-glib-0.7.6/doc/reference/html/json-tools.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/json-tools.html	2010-02-26 14:05:46.000000000 +0000
@@ -3,10 +3,10 @@
 <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.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="prev" href="json-glib-GObject-integration.html" title="GObject integration">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<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-Boxed-Types-Serialization.html" title="Boxed Types Serialization">
 <link rel="next" href="json-glib-Versioning-information.html" title="Versioning information">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -18,17 +18,22 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="json-glib-GObject-integration.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="json-glib-Boxed-Types-Serialization.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td><a accesskey="n" href="json-glib-Versioning-information.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part" title="Part V. JSON-GLib Additional Reference">
@@ -36,9 +41,12 @@
 <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><dt>
+<dl>
+<dt>
 <span class="refentrytitle"><a href="json-glib-Versioning-information.html">Versioning information</a></span><span class="refpurpose"> — JSON-GLib version checking</span>
-</dt></dl>
+</dt>
+<dt><span class="chapter"><a href="ch04.html">Object Hierarchy</a></span></dt>
+</dl>
 </div>
 </div>
 <div class="footer">
diff -Nru json-glib-0.7.6/doc/reference/html/license.html json-glib-0.10.2/doc/reference/html/license.html
--- json-glib-0.7.6/doc/reference/html/license.html	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/html/license.html	2010-02-26 14:05:46.000000000 +0000
@@ -3,10 +3,10 @@
 <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.75.1">
-<link rel="home" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="up" href="index.html" title="JSON-GLib 0.7.6 Reference Manual">
-<link rel="prev" href="ix02.html" title="Index of new symbols in 0.4">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="JSON-GLib Reference Manual">
+<link rel="up" href="index.html" title="JSON-GLib Reference Manual">
+<link rel="prev" href="annotation-glossary.html" title="Annotation Glossary">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <link rel="part" href="json-glib.html" title="Part I. JSON-GLib Overview">
@@ -17,17 +17,22 @@
 <link rel="chapter" href="ch03.html" title="Generator">
 <link rel="part" href="json-advanced.html" title="Part IV. JSON-GLib Advanced API">
 <link rel="part" href="json-tools.html" title="Part V. JSON-GLib Additional Reference">
+<link rel="chapter" href="ch04.html" title="Object Hierarchy">
 <link rel="index" href="ix01.html" title="Index">
-<link rel="index" href="ix02.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix02.html" title="Index of deprecated symbols">
+<link rel="index" href="ix03.html" title="Index of new symbols in 0.4">
+<link rel="index" href="ix04.html" title="Index of new symbols in 0.6">
+<link rel="index" href="ix05.html" title="Index of new symbols in 0.8">
+<link rel="index" href="ix06.html" title="Index of new symbols in 0.10">
+<link rel="glossary" href="annotation-glossary.html" title="Annotation Glossary">
 <link rel="appendix" href="license.html" title="Appendix A. License">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="ix02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="annotation-glossary.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">JSON-GLib 0.7.6
- Reference Manual</th>
+<th width="100%" align="center">JSON-GLib Reference Manual</th>
 <td> </td>
 </tr></table>
 <div class="appendix" title="Appendix A. License">
diff -Nru json-glib-0.7.6/doc/reference/json-glib-docs.sgml json-glib-0.10.2/doc/reference/json-glib-docs.sgml
--- json-glib-0.7.6/doc/reference/json-glib-docs.sgml	2009-06-25 18:46:42.000000000 +0100
+++ json-glib-0.10.2/doc/reference/json-glib-docs.sgml	1970-01-01 01:00:00.000000000 +0100
@@ -1,163 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>JSON-GLib &version; Reference Manual</title>
-    <releaseinfo>Version &version;</releaseinfo>
-
-    <copyright>
-      <year>2007</year>
-      <holder>OpenedHand LTD</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-        Permission is granted to copy, distribute and/or modify this
-        document under the terms of the <citetitle>GNU Free
-        Documentation License</citetitle>, Version 1.1 or any later
-        version published by the Free Software Foundation with no
-        Invariant Sections, no Front-Cover Texts, and no Back-Cover
-        Texts. You may obtain a copy of the <citetitle>GNU Free
-        Documentation License</citetitle> from the Free Software
-        Foundation by visiting <ulink type="http"
-        url="http://www.fsf.org">their Web site</ulink> or by writing
-        to:
-
-        <address>
-          The Free Software Foundation, Inc.,
-          <street>59 Temple Place</street> - Suite 330,
-          <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
-          <country>USA</country>
-        </address>
-      </para>
-    </legalnotice>
-
-    </bookinfo>
-
-  <part id="json-glib">
-    <title>JSON-GLib Overview</title>
-
-    <partintro>
-
-    <para>
-    JSON-GLib is a library aimed at providing an API for efficient parsing
-    and writing of JSON (JavaScript Object Notation) streams, using GLib's
-    data types and API.
-    </para>
-
-    </partintro>
-
-  </part>
-
-  <part id="json-base">
-    <title>JSON-GLib Reference</title>
-
-    <partintro>
-
-      <para>
-      JSON-GLib provides wrappers around the complex data types defined
-      by the JSON specification. The fundamental types are handled using
-      the Generic Value container (GValue) provided by GLib.
-      </para>
-
-      <para>
-      JSON complex data types are either arrays (a n-tuple of items)
-      or objects (a mapping between a string and a value); arrays and
-      objects can contain multiple values, including other arrays and
-      objects.
-      </para>
-
-    </partintro>
-
-    <chapter>
-      <title>Data Types</title>
-      <xi:include href="xml/json-node.xml"/>
-      <xi:include href="xml/json-array.xml"/>
-      <xi:include href="xml/json-object.xml"/>
-    </chapter>
-
-  </part>
-
-  <part id="json-streams">
-    <title>Reading and writing</title>
-
-    <partintro>
-
-      <para>
-      JSON-GLib provides a parser object to read any valid JSON data
-      stream and build the data object model in memory.
-      </para>
-
-    </partintro>
-
-    <chapter>
-      <title>Parser</title>
-      <xi:include href="xml/json-parser.xml"/>
-    </chapter>
-
-    <chapter>
-      <title>Generator</title>
-      <xi:include href="xml/json-generator.xml"/>
-    </chapter>
-
-  </part>
-
-  <part id="json-advanced">
-    <title>JSON-GLib Advanced API</title>
-
-    <xi:include href="xml/json-gobject.xml"/>
-  </part>
-
-  <part id="json-tools">
-    <title>JSON-GLib Additional Reference</title>
-
-    <xi:include href="xml/json-version.xml"/>
-  </part>
-
-  <index>
-    <title>Index</title>
-  </index>
-
-  <index role="0.4">
-    <title>Index of new symbols in 0.4</title>
-  </index>
-
-  <appendix id="license">
-    <title>License</title>
-
-    <para>
-      This library is free software; you can redistribute it and/or
-      modify it under the terms of the <citetitle>GNU Library General
-      Public License</citetitle> as published by the Free Software
-      Foundation; either version 2 of the License, or (at your option)
-      any later version.
-    </para>
-
-    <para>
-      This library is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      <citetitle>GNU Library General Public License</citetitle> for
-      more details.
-    </para>
-
-    <para>
-      You may obtain a copy of the <citetitle>GNU Library General
-      Public License</citetitle> from the Free Software Foundation by
-      visiting <ulink type="http" url="http://www.fsf.org">their Web
-      site</ulink> or by writing to:
-
-      <address>
-        Free Software Foundation, Inc.
-        <street>59 Temple Place</street> - Suite 330
-        <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
-        <country>USA</country>
-      </address>
-    </para>
-  </appendix>
-
-</book>
diff -Nru json-glib-0.7.6/doc/reference/json-glib-docs.xml json-glib-0.10.2/doc/reference/json-glib-docs.xml
--- json-glib-0.7.6/doc/reference/json-glib-docs.xml	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/json-glib-docs.xml	2009-10-29 14:37:07.000000000 +0000
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
+
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>JSON-GLib Reference Manual</title>
+    <releaseinfo>for JSON-GLib &version;</releaseinfo>
+
+    <copyright>
+      <year>2007, 2008</year>
+      <holder>OpenedHand LTD</holder>
+    </copyright>
+
+    <copyright>
+      <year>2009</year>
+      <holder>Intel Corporation</holder>
+    </copyright>
+
+    <legalnotice>
+      <para>
+        Permission is granted to copy, distribute and/or modify this
+        document under the terms of the <citetitle>GNU Free
+        Documentation License</citetitle>, Version 1.1 or any later
+        version published by the Free Software Foundation with no
+        Invariant Sections, no Front-Cover Texts, and no Back-Cover
+        Texts. You may obtain a copy of the <citetitle>GNU Free
+        Documentation License</citetitle> from the Free Software
+        Foundation by visiting <ulink type="http"
+        url="http://www.fsf.org">their Web site</ulink> or by writing
+        to:
+
+        <address>
+          The Free Software Foundation, Inc.,
+          <street>59 Temple Place</street> - Suite 330,
+          <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
+          <country>USA</country>
+        </address>
+      </para>
+    </legalnotice>
+
+    </bookinfo>
+
+  <part id="json-glib">
+    <title>JSON-GLib Overview</title>
+
+    <partintro>
+
+    <para>
+    JSON-GLib is a library aimed at providing an API for efficient parsing
+    and writing of JSON (JavaScript Object Notation) streams, using GLib's
+    data types and API.
+    </para>
+
+    </partintro>
+
+  </part>
+
+  <part id="json-base">
+    <title>JSON-GLib Reference</title>
+
+    <partintro>
+
+      <para>
+      JSON-GLib provides wrappers around the complex data types defined
+      by the JSON specification. The fundamental types are handled using
+      the Generic Value container (GValue) provided by GLib.
+      </para>
+
+      <para>
+      JSON complex data types are either arrays (a n-tuple of items)
+      or objects (a mapping between a string and a value); arrays and
+      objects can contain multiple values, including other arrays and
+      objects.
+      </para>
+
+    </partintro>
+
+    <chapter>
+      <title>Data Types</title>
+      <xi:include href="xml/json-node.xml"/>
+      <xi:include href="xml/json-array.xml"/>
+      <xi:include href="xml/json-object.xml"/>
+    </chapter>
+
+  </part>
+
+  <part id="json-streams">
+    <title>Reading and writing</title>
+
+    <partintro>
+
+      <para>
+      JSON-GLib provides a parser object to read any valid JSON data
+      stream and build the data object model in memory.
+      </para>
+
+    </partintro>
+
+    <chapter>
+      <title>Parser</title>
+      <xi:include href="xml/json-parser.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>Generator</title>
+      <xi:include href="xml/json-generator.xml"/>
+    </chapter>
+
+  </part>
+
+  <part id="json-advanced">
+    <title>JSON-GLib Advanced API</title>
+
+    <xi:include href="xml/json-gobject.xml"/>
+    <xi:include href="xml/json-serializable.xml"/>
+    <xi:include href="xml/json-gboxed.xml"/>
+  </part>
+
+  <part id="json-tools">
+    <title>JSON-GLib Additional Reference</title>
+
+    <xi:include href="xml/json-version.xml"/>
+
+    <chapter>
+      <title>Object Hierarchy</title>
+      <xi:include href="xml/tree_index.sgml"/>
+    </chapter>
+
+  </part>
+
+  <index>
+    <title>Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback/></xi:include>
+  </index>
+
+  <index role="deprecated">
+    <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback/></xi:include>
+  </index>
+
+  <index role="0.4">
+    <title>Index of new symbols in 0.4</title>
+    <xi:include href="xml/api-index-0.4.xml"><xi:fallback/></xi:include>
+  </index>
+
+  <index role="0.6">
+    <title>Index of new symbols in 0.6</title>
+    <xi:include href="xml/api-index-0.6.xml"><xi:fallback/></xi:include>
+  </index>
+
+  <index role="0.8">
+    <title>Index of new symbols in 0.8</title>
+    <xi:include href="xml/api-index-0.8.xml"><xi:fallback/></xi:include>
+  </index>
+
+  <index role="0.10">
+    <title>Index of new symbols in 0.10</title>
+    <xi:include href="xml/api-index-0.10.xml"><xi:fallback/></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"/>
+
+  <appendix id="license">
+    <title>License</title>
+
+    <para>
+      This library is free software; you can redistribute it and/or
+      modify it under the terms of the <citetitle>GNU Library General
+      Public License</citetitle> as published by the Free Software
+      Foundation; either version 2 of the License, or (at your option)
+      any later version.
+    </para>
+
+    <para>
+      This library is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+      <citetitle>GNU Library General Public License</citetitle> for
+      more details.
+    </para>
+
+    <para>
+      You may obtain a copy of the <citetitle>GNU Library General
+      Public License</citetitle> from the Free Software Foundation by
+      visiting <ulink type="http" url="http://www.fsf.org">their Web
+      site</ulink> or by writing to:
+
+      <address>
+        Free Software Foundation, Inc.
+        <street>59 Temple Place</street> - Suite 330
+        <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
+        <country>USA</country>
+      </address>
+    </para>
+  </appendix>
+
+</book>
diff -Nru json-glib-0.7.6/doc/reference/json-glib-sections.txt json-glib-0.10.2/doc/reference/json-glib-sections.txt
--- json-glib-0.7.6/doc/reference/json-glib-sections.txt	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/json-glib-sections.txt	2010-02-26 14:05:46.000000000 +0000
@@ -84,8 +84,13 @@
 <FILE>json-node</FILE>
 <TITLE>JSON Node</TITLE>
 JsonNodeType
-JSON_NODE_TYPE
 JsonNode
+JSON_NODE_TYPE
+JSON_NODE_HOLDS
+JSON_NODE_HOLDS_VALUE
+JSON_NODE_HOLDS_OBJECT
+JSON_NODE_HOLDS_ARRAY
+JSON_NODE_HOLDS_NULL
 json_node_new
 json_node_copy
 json_node_free
@@ -116,6 +121,7 @@
 json_node_dup_string
 
 <SUBSECTION>
+json_node_set_parent
 json_node_get_parent
 json_node_type_name
 json_node_get_value_type
@@ -187,15 +193,15 @@
 </SECTION>
 
 <SECTION>
-<FILE>json-gobject</FILE>
-<TITLE>GObject integration</TITLE>
+<FILE>json-serializable</FILE>
+<TITLE>Serializable Interface</TITLE>
 JsonSerializableIface
 json_serializable_serialize_property
 json_serializable_deserialize_property
 
 <SUBSECTION>
-json_serialize_gobject
-json_construct_gobject
+json_serializable_default_serialize_property
+json_serializable_default_deserialize_property
 
 <SUBSECTION Standard>
 JSON_TYPE_SERIALIZABLE
@@ -209,6 +215,34 @@
 </SECTION>
 
 <SECTION>
+<FILE>json-gboxed</FILE>
+<TITLE>Boxed Types Serialization</TITLE>
+JsonBoxedSerializeFunc
+JsonBoxedDeserializeFunc
+json_boxed_register_serialize_func
+json_boxed_register_deserialize_func
+
+<SUBSECTION>
+json_boxed_can_serialize
+json_boxed_can_deserialize
+json_boxed_serialize
+json_boxed_deserialize
+</SECTION>
+
+<SECTION>
+<FILE>json-gobject</FILE>
+<TITLE>GObject Serialization</TITLE>
+json_gobject_serialize
+json_gobject_deserialize
+json_gobject_to_data
+json_gobject_from_data
+
+<SUBSECTION>
+json_construct_gobject
+json_serialize_gobject
+</SECTION>
+
+<SECTION>
 <FILE>json-version</FILE>
 <TITLE>Versioning information</TITLE>
 JSON_MAJOR_VERSION
diff -Nru json-glib-0.7.6/doc/reference/Makefile.am json-glib-0.10.2/doc/reference/Makefile.am
--- json-glib-0.7.6/doc/reference/Makefile.am	2009-06-25 18:46:42.000000000 +0100
+++ json-glib-0.10.2/doc/reference/Makefile.am	2009-10-29 14:37:07.000000000 +0000
@@ -6,68 +6,67 @@
 # The name of the module, e.g. 'glib'.
 DOC_MODULE = json-glib
 
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+# The top-level XML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../json-glib
+DOC_SOURCE_DIR = ../../json-glib
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS = --type-init-func="g_type_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=--deprecated-guards="JSON_DISABLE_DEPRECATED"
+SCAN_OPTIONS = --deprecated-guards="JSON_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=json
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
+MKTMPL_OPTIONS =
 
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=\
+FIXXREF_OPTIONS = \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
-CFILE_GLOB=$(top_srcdir)/json-glib/*.c
+HFILE_GLOB = $(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
+CFILE_GLOB = $(top_srcdir)/json-glib/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=\
-	json-scanner.h \
-	json-types-private.h \
-	json-private.h \
-	json-marshal.h \
-	json-glib.h \
-	json-enum-types.h \
-	stamp-json-enum-types.h \
-	stamp-json-marshal.h
+IGNORE_HFILES = \
+	json-scanner.h 		\
+	json-types-private.h 	\
+	json-gobject-private.h	\
+	json-private.h 		\
+	json-marshal.h 		\
+	json-glib.h 		\
+	json-enum-types.h
 
-EXTRA_HFILES=
+EXTRA_HFILES =
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
+HTML_IMAGES =
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=version.xml
+content_files = version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
 # e.g. expand_content_files=running.sgml
-expand_content_files=
+expand_content_files =
 
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
@@ -75,9 +74,12 @@
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
-INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
 
+# needed to avoid including Makefile.am.gtest which redeclares
+# EXTRA_DIST and generates a warning when the gtk-doc.make include
+# below
 test-report:
 	@true
 
diff -Nru json-glib-0.7.6/doc/reference/Makefile.in json-glib-0.10.2/doc/reference/Makefile.in
--- json-glib-0.7.6/doc/reference/Makefile.in	2009-08-12 16:07:48.000000000 +0100
+++ json-glib-0.10.2/doc/reference/Makefile.in	2010-02-26 14:05:04.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -26,8 +27,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -55,19 +57,25 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -78,7 +86,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -89,8 +96,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -118,6 +123,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -127,12 +133,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -145,13 +150,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -199,7 +202,6 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -210,8 +212,8 @@
 # The name of the module, e.g. 'glib'.
 DOC_MODULE = json-glib
 
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+# The top-level XML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
@@ -228,7 +230,7 @@
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS = --sgml-mode --output-format=xml
+MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=json
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -250,14 +252,13 @@
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES = \
-	json-scanner.h \
-	json-types-private.h \
-	json-private.h \
-	json-marshal.h \
-	json-glib.h \
-	json-enum-types.h \
-	stamp-json-enum-types.h \
-	stamp-json-marshal.h
+	json-scanner.h 		\
+	json-types-private.h 	\
+	json-gobject-private.h	\
+	json-private.h 		\
+	json-marshal.h 		\
+	json-glib.h 		\
+	json-enum-types.h
 
 EXTRA_HFILES = 
 
@@ -331,9 +332,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/reference/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/reference/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/reference/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu doc/reference/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -351,6 +352,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -382,13 +384,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -421,6 +427,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -439,6 +446,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -447,18 +456,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -480,7 +499,7 @@
 
 uninstall-am: uninstall-local
 
-.MAKE: install-am install-strip
+.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 \
@@ -497,6 +516,9 @@
 	uninstall-local
 
 
+# needed to avoid including Makefile.am.gtest which redeclares
+# EXTRA_DIST and generates a warning when the gtk-doc.make include
+# below
 test-report:
 	@true
 
@@ -645,6 +667,7 @@
 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-array.sgml json-glib-0.10.2/doc/reference/tmpl/json-array.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-array.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-array.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -9,13 +9,11 @@
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-gboxed.sgml json-glib-0.10.2/doc/reference/tmpl/json-gboxed.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-gboxed.sgml	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-gboxed.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,97 @@
+<!-- ##### SECTION Title ##### -->
+Boxed Types Serialization
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### USER_FUNCTION JsonBoxedSerializeFunc ##### -->
+<para>
+
+</para>
+
+@boxed: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION JsonBoxedDeserializeFunc ##### -->
+<para>
+
+</para>
+
+@node: 
+@Returns: 
+
+
+<!-- ##### FUNCTION json_boxed_register_serialize_func ##### -->
+<para>
+
+</para>
+
+@gboxed_type: 
+@node_type: 
+@serialize_func: 
+
+
+<!-- ##### FUNCTION json_boxed_register_deserialize_func ##### -->
+<para>
+
+</para>
+
+@gboxed_type: 
+@node_type: 
+@deserialize_func: 
+
+
+<!-- ##### FUNCTION json_boxed_can_serialize ##### -->
+<para>
+
+</para>
+
+@gboxed_type: 
+@node_type: 
+@Returns: 
+
+
+<!-- ##### FUNCTION json_boxed_can_deserialize ##### -->
+<para>
+
+</para>
+
+@gboxed_type: 
+@node_type: 
+@Returns: 
+
+
+<!-- ##### FUNCTION json_boxed_serialize ##### -->
+<para>
+
+</para>
+
+@gboxed_type: 
+@boxed: 
+@Returns: 
+
+
+<!-- ##### FUNCTION json_boxed_deserialize ##### -->
+<para>
+
+</para>
+
+@gboxed_type: 
+@node: 
+@Returns: 
+
+
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-generator.sgml json-glib-0.10.2/doc/reference/tmpl/json-generator.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-generator.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-generator.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -9,13 +9,11 @@
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-gobject.sgml json-glib-0.10.2/doc/reference/tmpl/json-gobject.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-gobject.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-gobject.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -1,5 +1,5 @@
 <!-- ##### SECTION Title ##### -->
-GObject integration
+GObject Serialization
 
 <!-- ##### SECTION Short_Description ##### -->
 
@@ -9,56 +9,52 @@
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT JsonSerializableIface ##### -->
+<!-- ##### FUNCTION json_gobject_serialize ##### -->
 <para>
 
 </para>
 
-@serialize_property: 
-@deserialize_property: 
+@gobject: 
+@Returns: 
+
 
-<!-- ##### FUNCTION json_serializable_serialize_property ##### -->
+<!-- ##### FUNCTION json_gobject_deserialize ##### -->
 <para>
 
 </para>
 
-@serializable: 
-@property_name: 
-@value: 
-@pspec: 
+@gtype: 
+@node: 
 @Returns: 
 
 
-<!-- ##### FUNCTION json_serializable_deserialize_property ##### -->
+<!-- ##### FUNCTION json_gobject_to_data ##### -->
 <para>
 
 </para>
 
-@serializable: 
-@property_name: 
-@value: 
-@pspec: 
-@property_node: 
+@gobject: 
+@length: 
 @Returns: 
 
 
-<!-- ##### FUNCTION json_serialize_gobject ##### -->
+<!-- ##### FUNCTION json_gobject_from_data ##### -->
 <para>
 
 </para>
 
-@gobject: 
+@gtype: 
+@data: 
 @length: 
+@error: 
 @Returns: 
 
 
@@ -74,3 +70,13 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION json_serialize_gobject ##### -->
+<para>
+
+</para>
+
+@gobject: 
+@length: 
+@Returns: 
+
+
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-node.sgml json-glib-0.10.2/doc/reference/tmpl/json-node.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-node.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-node.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -9,13 +9,11 @@
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -29,6 +27,12 @@
 @JSON_NODE_VALUE: 
 @JSON_NODE_NULL: 
 
+<!-- ##### STRUCT JsonNode ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO JSON_NODE_TYPE ##### -->
 <para>
 
@@ -37,11 +41,46 @@
 @node: 
 
 
-<!-- ##### STRUCT JsonNode ##### -->
+<!-- ##### MACRO JSON_NODE_HOLDS ##### -->
+<para>
+
+</para>
+
+@node: 
+@t: 
+
+
+<!-- ##### MACRO JSON_NODE_HOLDS_VALUE ##### -->
+<para>
+
+</para>
+
+@node: 
+
+
+<!-- ##### MACRO JSON_NODE_HOLDS_OBJECT ##### -->
 <para>
 
 </para>
 
+@node: 
+
+
+<!-- ##### MACRO JSON_NODE_HOLDS_ARRAY ##### -->
+<para>
+
+</para>
+
+@node: 
+
+
+<!-- ##### MACRO JSON_NODE_HOLDS_NULL ##### -->
+<para>
+
+</para>
+
+@node: 
+
 
 <!-- ##### FUNCTION json_node_new ##### -->
 <para>
@@ -240,6 +279,15 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION json_node_set_parent ##### -->
+<para>
+
+</para>
+
+@node: 
+@parent: 
+
+
 <!-- ##### FUNCTION json_node_get_parent ##### -->
 <para>
 
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-object.sgml json-glib-0.10.2/doc/reference/tmpl/json-object.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-object.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-object.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -9,13 +9,11 @@
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-parser.sgml json-glib-0.10.2/doc/reference/tmpl/json-parser.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-parser.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-parser.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -9,13 +9,11 @@
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-serializable.sgml json-glib-0.10.2/doc/reference/tmpl/json-serializable.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-serializable.sgml	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-serializable.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -0,0 +1,77 @@
+<!-- ##### SECTION Title ##### -->
+Serializable Interface
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT JsonSerializableIface ##### -->
+<para>
+
+</para>
+
+@serialize_property: 
+@deserialize_property: 
+
+<!-- ##### FUNCTION json_serializable_serialize_property ##### -->
+<para>
+
+</para>
+
+@serializable: 
+@property_name: 
+@value: 
+@pspec: 
+@Returns: 
+
+
+<!-- ##### FUNCTION json_serializable_deserialize_property ##### -->
+<para>
+
+</para>
+
+@serializable: 
+@property_name: 
+@value: 
+@pspec: 
+@property_node: 
+@Returns: 
+
+
+<!-- ##### FUNCTION json_serializable_default_serialize_property ##### -->
+<para>
+
+</para>
+
+@serializable: 
+@property_name: 
+@value: 
+@pspec: 
+@Returns: 
+
+
+<!-- ##### FUNCTION json_serializable_default_deserialize_property ##### -->
+<para>
+
+</para>
+
+@serializable: 
+@property_name: 
+@value: 
+@pspec: 
+@property_node: 
+@Returns: 
+
+
diff -Nru json-glib-0.7.6/doc/reference/tmpl/json-version.sgml json-glib-0.10.2/doc/reference/tmpl/json-version.sgml
--- json-glib-0.7.6/doc/reference/tmpl/json-version.sgml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/tmpl/json-version.sgml	2010-04-13 12:00:33.000000000 +0100
@@ -9,13 +9,11 @@
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff -Nru json-glib-0.7.6/doc/reference/version.xml json-glib-0.10.2/doc/reference/version.xml
--- json-glib-0.7.6/doc/reference/version.xml	2009-08-12 16:07:39.000000000 +0100
+++ json-glib-0.10.2/doc/reference/version.xml	2010-02-26 14:04:34.000000000 +0000
@@ -1 +1 @@
-0.7.6
+0.10.2
diff -Nru json-glib-0.7.6/doc/reference/xml/annotation-glossary.xml json-glib-0.10.2/doc/reference/xml/annotation-glossary.xml
--- json-glib-0.7.6/doc/reference/xml/annotation-glossary.xml	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/annotation-glossary.xml	2010-02-26 14:05:46.000000000 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
+
+
+<glossary id="annotation-glossary">
+  <title>Annotation Glossary</title>
+<glossdiv><title>O</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-out"/>out</glossterm>
+      <glossdef>
+        <para>Parameter for returning results. Default is <acronym>transfer-full</acronym>.</para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+<glossdiv><title>A</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-allow-none"/>allow-none</glossterm>
+      <glossdef>
+        <para></para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+<glossdiv><title>E</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-element-type"/>element-type</glossterm>
+      <glossdef>
+        <para>Generics and defining elements of containers and arrays.</para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+<glossdiv><title>T</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-transfer"/>transfer</glossterm>
+      <glossdef>
+        <para></para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+</glossary>
diff -Nru json-glib-0.7.6/doc/reference/xml/api-index-0.10.xml json-glib-0.10.2/doc/reference/xml/api-index-0.10.xml
--- json-glib-0.7.6/doc/reference/xml/api-index-0.10.xml	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/api-index-0.10.xml	2010-02-26 14:05:46.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
+
+<indexdiv>
+<indexdiv><title>B</title>
+<indexentry><primaryie linkends="JsonBoxedDeserializeFunc"><link linkend="JsonBoxedDeserializeFunc">JsonBoxedDeserializeFunc</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonBoxedSerializeFunc"><link linkend="JsonBoxedSerializeFunc">JsonBoxedSerializeFunc</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-can-deserialize"><link linkend="json-boxed-can-deserialize">json_boxed_can_deserialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-can-serialize"><link linkend="json-boxed-can-serialize">json_boxed_can_serialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-deserialize"><link linkend="json-boxed-deserialize">json_boxed_deserialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-register-deserialize-func"><link linkend="json-boxed-register-deserialize-func">json_boxed_register_deserialize_func</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-register-serialize-func"><link linkend="json-boxed-register-serialize-func">json_boxed_register_serialize_func</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-serialize"><link linkend="json-boxed-serialize">json_boxed_serialize</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>G</title>
+<indexentry><primaryie linkends="json-gobject-deserialize"><link linkend="json-gobject-deserialize">json_gobject_deserialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-gobject-from-data"><link linkend="json-gobject-from-data">json_gobject_from_data</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-gobject-serialize"><link linkend="json-gobject-serialize">json_gobject_serialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-gobject-to-data"><link linkend="json-gobject-to-data">json_gobject_to_data</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>N</title>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS--CAPS"><link linkend="JSON-NODE-HOLDS--CAPS">JSON_NODE_HOLDS</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-ARRAY--CAPS"><link linkend="JSON-NODE-HOLDS-ARRAY--CAPS">JSON_NODE_HOLDS_ARRAY</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-NULL--CAPS"><link linkend="JSON-NODE-HOLDS-NULL--CAPS">JSON_NODE_HOLDS_NULL</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-OBJECT--CAPS"><link linkend="JSON-NODE-HOLDS-OBJECT--CAPS">JSON_NODE_HOLDS_OBJECT</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-VALUE--CAPS"><link linkend="JSON-NODE-HOLDS-VALUE--CAPS">JSON_NODE_HOLDS_VALUE</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>S</title>
+<indexentry><primaryie linkends="json-serializable-default-deserialize-property"><link linkend="json-serializable-default-deserialize-property">json_serializable_default_deserialize_property</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-serializable-default-serialize-property"><link linkend="json-serializable-default-serialize-property">json_serializable_default_serialize_property</link></primaryie></indexentry>
+</indexdiv>
+</indexdiv>
diff -Nru json-glib-0.7.6/doc/reference/xml/api-index-0.4.xml json-glib-0.10.2/doc/reference/xml/api-index-0.4.xml
--- json-glib-0.7.6/doc/reference/xml/api-index-0.4.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/api-index-0.4.xml	2010-02-26 14:05:46.000000000 +0000
@@ -5,10 +5,16 @@
 ]>
 
 <indexdiv>
-<indexdiv><title>J</title>
-<indexentry><primaryie linkends="JsonGenerator--root"><link linkend="JsonGenerator--root">JsonGenerator:root</link></primaryie></indexentry>
+<indexdiv><title>C</title>
 <indexentry><primaryie linkends="json-construct-gobject"><link linkend="json-construct-gobject">json_construct_gobject</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>G</title>
+<indexentry><primaryie linkends="JsonGenerator--root"><link linkend="JsonGenerator--root">JsonGenerator:root</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>N</title>
 <indexentry><primaryie linkends="json-node-get-value-type"><link linkend="json-node-get-value-type">json_node_get_value_type</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>P</title>
 <indexentry><primaryie linkends="json-parser-has-assignment"><link linkend="json-parser-has-assignment">json_parser_has_assignment</link></primaryie></indexentry>
 </indexdiv>
 </indexdiv>
diff -Nru json-glib-0.7.6/doc/reference/xml/api-index-0.6.xml json-glib-0.10.2/doc/reference/xml/api-index-0.6.xml
--- json-glib-0.7.6/doc/reference/xml/api-index-0.6.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/api-index-0.6.xml	2010-02-26 14:05:46.000000000 +0000
@@ -5,9 +5,13 @@
 ]>
 
 <indexdiv>
-<indexdiv><title>J</title>
-<indexentry><primaryie linkends="JsonGenerator--indent-char"><link linkend="JsonGenerator--indent-char">JsonGenerator:indent-char</link></primaryie></indexentry>
+<indexdiv><title>A</title>
 <indexentry><primaryie linkends="json-array-dup-element"><link linkend="json-array-dup-element">json_array_dup_element</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>G</title>
+<indexentry><primaryie linkends="JsonGenerator--indent-char"><link linkend="JsonGenerator--indent-char">JsonGenerator:indent-char</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>O</title>
 <indexentry><primaryie linkends="json-object-dup-member"><link linkend="json-object-dup-member">json_object_dup_member</link></primaryie></indexentry>
 </indexdiv>
 </indexdiv>
diff -Nru json-glib-0.7.6/doc/reference/xml/api-index-0.8.xml json-glib-0.10.2/doc/reference/xml/api-index-0.8.xml
--- json-glib-0.7.6/doc/reference/xml/api-index-0.8.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/api-index-0.8.xml	2010-02-26 14:05:46.000000000 +0000
@@ -5,9 +5,8 @@
 ]>
 
 <indexdiv>
-<indexdiv><title>J</title>
+<indexdiv><title>A</title>
 <indexentry><primaryie linkends="JsonArrayForeach"><link linkend="JsonArrayForeach">JsonArrayForeach</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonObjectForeach"><link linkend="JsonObjectForeach">JsonObjectForeach</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-add-array-element"><link linkend="json-array-add-array-element">json_array_add_array_element</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-add-boolean-element"><link linkend="json-array-add-boolean-element">json_array_add_boolean_element</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-add-double-element"><link linkend="json-array-add-double-element">json_array_add_double_element</link></primaryie></indexentry>
@@ -23,8 +22,14 @@
 <indexentry><primaryie linkends="json-array-get-null-element"><link linkend="json-array-get-null-element">json_array_get_null_element</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-get-object-element"><link linkend="json-array-get-object-element">json_array_get_object_element</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-get-string-element"><link linkend="json-array-get-string-element">json_array_get_string_element</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>N</title>
 <indexentry><primaryie linkends="json-node-get-node-type"><link linkend="json-node-get-node-type">json_node_get_node_type</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-is-null"><link linkend="json-node-is-null">json_node_is_null</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-node-set-parent"><link linkend="json-node-set-parent">json_node_set_parent</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>O</title>
+<indexentry><primaryie linkends="JsonObjectForeach"><link linkend="JsonObjectForeach">JsonObjectForeach</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-foreach-member"><link linkend="json-object-foreach-member">json_object_foreach_member</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-get-array-member"><link linkend="json-object-get-array-member">json_object_get_array_member</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-get-boolean-member"><link linkend="json-object-get-boolean-member">json_object_get_boolean_member</link></primaryie></indexentry>
diff -Nru json-glib-0.7.6/doc/reference/xml/api-index-deprecated.xml json-glib-0.10.2/doc/reference/xml/api-index-deprecated.xml
--- json-glib-0.7.6/doc/reference/xml/api-index-deprecated.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/api-index-deprecated.xml	2010-02-26 14:05:46.000000000 +0000
@@ -5,7 +5,13 @@
 ]>
 
 <indexdiv>
-<indexdiv><title>J</title>
+<indexdiv><title>C</title>
+<indexentry><primaryie linkends="json-construct-gobject"><link linkend="json-construct-gobject">json_construct_gobject</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>O</title>
 <indexentry><primaryie linkends="json-object-add-member"><link linkend="json-object-add-member">json_object_add_member</link></primaryie></indexentry>
 </indexdiv>
+<indexdiv><title>S</title>
+<indexentry><primaryie linkends="json-serialize-gobject"><link linkend="json-serialize-gobject">json_serialize_gobject</link></primaryie></indexentry>
+</indexdiv>
 </indexdiv>
diff -Nru json-glib-0.7.6/doc/reference/xml/api-index-full.xml json-glib-0.10.2/doc/reference/xml/api-index-full.xml
--- json-glib-0.7.6/doc/reference/xml/api-index-full.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/api-index-full.xml	2010-02-26 14:05:46.000000000 +0000
@@ -5,32 +5,9 @@
 ]>
 
 <indexdiv>
-<indexdiv><title>J</title>
+<indexdiv><title>A</title>
 <indexentry><primaryie linkends="JsonArray"><link linkend="JsonArray">JsonArray</link></primaryie></indexentry>
 <indexentry><primaryie linkends="JsonArrayForeach"><link linkend="JsonArrayForeach">JsonArrayForeach</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonGenerator-struct"><link linkend="JsonGenerator">JsonGenerator</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonGenerator--indent"><link linkend="JsonGenerator--indent">JsonGenerator:indent</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonGenerator--indent-char"><link linkend="JsonGenerator--indent-char">JsonGenerator:indent-char</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonGenerator--pretty"><link linkend="JsonGenerator--pretty">JsonGenerator:pretty</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonGenerator--root"><link linkend="JsonGenerator--root">JsonGenerator:root</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonGeneratorClass"><link linkend="JsonGeneratorClass">JsonGeneratorClass</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonNode"><link linkend="JsonNode">JsonNode</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonNodeType"><link linkend="JsonNodeType">JsonNodeType</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonObject"><link linkend="JsonObject">JsonObject</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonObjectForeach"><link linkend="JsonObjectForeach">JsonObjectForeach</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-struct"><link linkend="JsonParser">JsonParser</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-array-element"><link linkend="JsonParser-array-element">JsonParser::array-element</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-array-end"><link linkend="JsonParser-array-end">JsonParser::array-end</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-array-start"><link linkend="JsonParser-array-start">JsonParser::array-start</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-error"><link linkend="JsonParser-error">JsonParser::error</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-object-end"><link linkend="JsonParser-object-end">JsonParser::object-end</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-object-member"><link linkend="JsonParser-object-member">JsonParser::object-member</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-object-start"><link linkend="JsonParser-object-start">JsonParser::object-start</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-parse-end"><link linkend="JsonParser-parse-end">JsonParser::parse-end</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParser-parse-start"><link linkend="JsonParser-parse-start">JsonParser::parse-start</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParserClass"><link linkend="JsonParserClass">JsonParserClass</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonParserError"><link linkend="JsonParserError">JsonParserError</link></primaryie></indexentry>
-<indexentry><primaryie linkends="JsonSerializableIface"><link linkend="JsonSerializableIface">JsonSerializableIface</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-add-array-element"><link linkend="json-array-add-array-element">json_array_add_array_element</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-add-boolean-element"><link linkend="json-array-add-boolean-element">json_array_add_boolean_element</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-add-double-element"><link linkend="json-array-add-double-element">json_array_add_double_element</link></primaryie></indexentry>
@@ -56,15 +33,45 @@
 <indexentry><primaryie linkends="json-array-remove-element"><link linkend="json-array-remove-element">json_array_remove_element</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-sized-new"><link linkend="json-array-sized-new">json_array_sized_new</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-array-unref"><link linkend="json-array-unref">json_array_unref</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>B</title>
+<indexentry><primaryie linkends="JsonBoxedDeserializeFunc"><link linkend="JsonBoxedDeserializeFunc">JsonBoxedDeserializeFunc</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonBoxedSerializeFunc"><link linkend="JsonBoxedSerializeFunc">JsonBoxedSerializeFunc</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-can-deserialize"><link linkend="json-boxed-can-deserialize">json_boxed_can_deserialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-can-serialize"><link linkend="json-boxed-can-serialize">json_boxed_can_serialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-deserialize"><link linkend="json-boxed-deserialize">json_boxed_deserialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-register-deserialize-func"><link linkend="json-boxed-register-deserialize-func">json_boxed_register_deserialize_func</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-register-serialize-func"><link linkend="json-boxed-register-serialize-func">json_boxed_register_serialize_func</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-boxed-serialize"><link linkend="json-boxed-serialize">json_boxed_serialize</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>C</title>
 <indexentry><primaryie linkends="JSON-CHECK-VERSION--CAPS"><link linkend="JSON-CHECK-VERSION--CAPS">JSON_CHECK_VERSION</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-construct-gobject"><link linkend="json-construct-gobject">json_construct_gobject</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>G</title>
+<indexentry><primaryie linkends="JsonGenerator-struct"><link linkend="JsonGenerator-struct">JsonGenerator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonGenerator--indent"><link linkend="JsonGenerator--indent">JsonGenerator:indent</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonGenerator--indent-char"><link linkend="JsonGenerator--indent-char">JsonGenerator:indent-char</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonGenerator--pretty"><link linkend="JsonGenerator--pretty">JsonGenerator:pretty</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonGenerator--root"><link linkend="JsonGenerator--root">JsonGenerator:root</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonGeneratorClass"><link linkend="JsonGeneratorClass">JsonGeneratorClass</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-generator-new"><link linkend="json-generator-new">json_generator_new</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-generator-set-root"><link linkend="json-generator-set-root">json_generator_set_root</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-generator-to-data"><link linkend="json-generator-to-data">json_generator_to_data</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-generator-to-file"><link linkend="json-generator-to-file">json_generator_to_file</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-gobject-deserialize"><link linkend="json-gobject-deserialize">json_gobject_deserialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-gobject-from-data"><link linkend="json-gobject-from-data">json_gobject_from_data</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-gobject-serialize"><link linkend="json-gobject-serialize">json_gobject_serialize</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-gobject-to-data"><link linkend="json-gobject-to-data">json_gobject_to_data</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>M</title>
 <indexentry><primaryie linkends="JSON-MAJOR-VERSION--CAPS"><link linkend="JSON-MAJOR-VERSION--CAPS">JSON_MAJOR_VERSION</link></primaryie></indexentry>
 <indexentry><primaryie linkends="JSON-MICRO-VERSION--CAPS"><link linkend="JSON-MICRO-VERSION--CAPS">JSON_MICRO_VERSION</link></primaryie></indexentry>
 <indexentry><primaryie linkends="JSON-MINOR-VERSION--CAPS"><link linkend="JSON-MINOR-VERSION--CAPS">JSON_MINOR_VERSION</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>N</title>
+<indexentry><primaryie linkends="JsonNode"><link linkend="JsonNode">JsonNode</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonNodeType"><link linkend="JsonNodeType">JsonNodeType</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-copy"><link linkend="json-node-copy">json_node_copy</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-dup-array"><link linkend="json-node-dup-array">json_node_dup_array</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-dup-object"><link linkend="json-node-dup-object">json_node_dup_object</link></primaryie></indexentry>
@@ -80,6 +87,11 @@
 <indexentry><primaryie linkends="json-node-get-string"><link linkend="json-node-get-string">json_node_get_string</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-get-value"><link linkend="json-node-get-value">json_node_get_value</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-get-value-type"><link linkend="json-node-get-value-type">json_node_get_value_type</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS--CAPS"><link linkend="JSON-NODE-HOLDS--CAPS">JSON_NODE_HOLDS</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-ARRAY--CAPS"><link linkend="JSON-NODE-HOLDS-ARRAY--CAPS">JSON_NODE_HOLDS_ARRAY</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-NULL--CAPS"><link linkend="JSON-NODE-HOLDS-NULL--CAPS">JSON_NODE_HOLDS_NULL</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-OBJECT--CAPS"><link linkend="JSON-NODE-HOLDS-OBJECT--CAPS">JSON_NODE_HOLDS_OBJECT</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JSON-NODE-HOLDS-VALUE--CAPS"><link linkend="JSON-NODE-HOLDS-VALUE--CAPS">JSON_NODE_HOLDS_VALUE</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-is-null"><link linkend="json-node-is-null">json_node_is_null</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-new"><link linkend="json-node-new">json_node_new</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-set-array"><link linkend="json-node-set-array">json_node_set_array</link></primaryie></indexentry>
@@ -87,12 +99,17 @@
 <indexentry><primaryie linkends="json-node-set-double"><link linkend="json-node-set-double">json_node_set_double</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-set-int"><link linkend="json-node-set-int">json_node_set_int</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-set-object"><link linkend="json-node-set-object">json_node_set_object</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-node-set-parent"><link linkend="json-node-set-parent">json_node_set_parent</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-set-string"><link linkend="json-node-set-string">json_node_set_string</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-set-value"><link linkend="json-node-set-value">json_node_set_value</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-take-array"><link linkend="json-node-take-array">json_node_take_array</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-take-object"><link linkend="json-node-take-object">json_node_take_object</link></primaryie></indexentry>
 <indexentry><primaryie linkends="JSON-NODE-TYPE--CAPS"><link linkend="JSON-NODE-TYPE--CAPS">JSON_NODE_TYPE</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-node-type-name"><link linkend="json-node-type-name">json_node_type_name</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>O</title>
+<indexentry><primaryie linkends="JsonObject"><link linkend="JsonObject">JsonObject</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonObjectForeach"><link linkend="JsonObjectForeach">JsonObjectForeach</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-add-member"><link linkend="json-object-add-member">json_object_add_member</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-dup-member"><link linkend="json-object-dup-member">json_object_dup_member</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-foreach-member"><link linkend="json-object-foreach-member">json_object_foreach_member</link></primaryie></indexentry>
@@ -120,6 +137,20 @@
 <indexentry><primaryie linkends="json-object-set-object-member"><link linkend="json-object-set-object-member">json_object_set_object_member</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-set-string-member"><link linkend="json-object-set-string-member">json_object_set_string_member</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-object-unref"><link linkend="json-object-unref">json_object_unref</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>P</title>
+<indexentry><primaryie linkends="JsonParser-struct"><link linkend="JsonParser-struct">JsonParser</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-array-element"><link linkend="JsonParser-array-element">JsonParser::array-element</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-array-end"><link linkend="JsonParser-array-end">JsonParser::array-end</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-array-start"><link linkend="JsonParser-array-start">JsonParser::array-start</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-error"><link linkend="JsonParser-error">JsonParser::error</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-object-end"><link linkend="JsonParser-object-end">JsonParser::object-end</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-object-member"><link linkend="JsonParser-object-member">JsonParser::object-member</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-object-start"><link linkend="JsonParser-object-start">JsonParser::object-start</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-parse-end"><link linkend="JsonParser-parse-end">JsonParser::parse-end</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParser-parse-start"><link linkend="JsonParser-parse-start">JsonParser::parse-start</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParserClass"><link linkend="JsonParserClass">JsonParserClass</link></primaryie></indexentry>
+<indexentry><primaryie linkends="JsonParserError"><link linkend="JsonParserError">JsonParserError</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-parser-get-current-line"><link linkend="json-parser-get-current-line">json_parser_get_current_line</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-parser-get-current-pos"><link linkend="json-parser-get-current-pos">json_parser_get_current_pos</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-parser-get-root"><link linkend="json-parser-get-root">json_parser_get_root</link></primaryie></indexentry>
@@ -127,9 +158,16 @@
 <indexentry><primaryie linkends="json-parser-load-from-data"><link linkend="json-parser-load-from-data">json_parser_load_from_data</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-parser-load-from-file"><link linkend="json-parser-load-from-file">json_parser_load_from_file</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-parser-new"><link linkend="json-parser-new">json_parser_new</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>S</title>
+<indexentry><primaryie linkends="JsonSerializableIface"><link linkend="JsonSerializableIface">JsonSerializableIface</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-serializable-default-deserialize-property"><link linkend="json-serializable-default-deserialize-property">json_serializable_default_deserialize_property</link></primaryie></indexentry>
+<indexentry><primaryie linkends="json-serializable-default-serialize-property"><link linkend="json-serializable-default-serialize-property">json_serializable_default_serialize_property</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-serializable-deserialize-property"><link linkend="json-serializable-deserialize-property">json_serializable_deserialize_property</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-serializable-serialize-property"><link linkend="json-serializable-serialize-property">json_serializable_serialize_property</link></primaryie></indexentry>
 <indexentry><primaryie linkends="json-serialize-gobject"><link linkend="json-serialize-gobject">json_serialize_gobject</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>V</title>
 <indexentry><primaryie linkends="JSON-VERSION--CAPS"><link linkend="JSON-VERSION--CAPS">JSON_VERSION</link></primaryie></indexentry>
 <indexentry><primaryie linkends="JSON-VERSION-HEX--CAPS"><link linkend="JSON-VERSION-HEX--CAPS">JSON_VERSION_HEX</link></primaryie></indexentry>
 <indexentry><primaryie linkends="JSON-VERSION-S--CAPS"><link linkend="JSON-VERSION-S--CAPS">JSON_VERSION_S</link></primaryie></indexentry>
diff -Nru json-glib-0.7.6/doc/reference/xml/json-array.xml json-glib-0.10.2/doc/reference/xml/json-array.xml
--- json-glib-0.7.6/doc/reference/xml/json-array.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-array.xml	2010-02-26 14:05:46.000000000 +0000
@@ -106,7 +106,7 @@
 <title role="details.title">Details</title>
 <refsect2 id="JsonArray" role="struct">
 <title>JsonArray</title>
-<indexterm zone="JsonArray"><primary sortas="JsonArray">JsonArray</primary></indexterm><programlisting>typedef struct _JsonArray JsonArray;</programlisting>
+<indexterm zone="JsonArray"><primary sortas="Array">JsonArray</primary></indexterm><programlisting>typedef struct _JsonArray JsonArray;</programlisting>
 <para>
 A JSON array type. The contents of the <link linkend="JsonArray"><type>JsonArray</type></link> structure are private
 and should only be accessed by the provided API</para>
@@ -114,7 +114,7 @@
 </para></refsect2>
 <refsect2 id="json-array-new" role="function">
 <title>json_array_new ()</title>
-<indexterm zone="json-array-new"><primary sortas="json_array_new">json_array_new</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_new                      (void);</programlisting>
+<indexterm zone="json-array-new"><primary sortas="array_new">json_array_new</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_new                      (void);</programlisting>
 <para>
 Creates a new <link linkend="JsonArray"><type>JsonArray</type></link>.</para>
 <para>
@@ -124,7 +124,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-array-sized-new" role="function">
 <title>json_array_sized_new ()</title>
-<indexterm zone="json-array-sized-new"><primary sortas="json_array_sized_new">json_array_sized_new</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_sized_new                (<link linkend="guint">guint</link> n_elements);</programlisting>
+<indexterm zone="json-array-sized-new"><primary sortas="array_sized_new">json_array_sized_new</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_sized_new                (<link linkend="guint">guint</link> n_elements);</programlisting>
 <para>
 Creates a new <link linkend="JsonArray"><type>JsonArray</type></link> with <parameter>n_elements</parameter> slots already allocated.</para>
 <para>
@@ -137,7 +137,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-array-ref" role="function">
 <title>json_array_ref ()</title>
-<indexterm zone="json-array-ref"><primary sortas="json_array_ref">json_array_ref</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_ref                      (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
+<indexterm zone="json-array-ref"><primary sortas="array_ref">json_array_ref</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_ref                      (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
 <para>
 Increase by one the reference count of a <link linkend="JsonArray"><type>JsonArray</type></link>.</para>
 <para>
@@ -151,7 +151,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-array-unref" role="function">
 <title>json_array_unref ()</title>
-<indexterm zone="json-array-unref"><primary sortas="json_array_unref">json_array_unref</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_unref                    (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
+<indexterm zone="json-array-unref"><primary sortas="array_unref">json_array_unref</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_unref                    (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
 <para>
 Decreases by one the reference count of a <link linkend="JsonArray"><type>JsonArray</type></link>. If the
 reference count reaches zero, the array is destroyed and all
@@ -164,7 +164,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-array-add-element" role="function">
 <title>json_array_add_element ()</title>
-<indexterm zone="json-array-add-element"><primary sortas="json_array_add_element">json_array_add_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_element              (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-add-element"><primary sortas="array_add_element">json_array_add_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_element              (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Appends <parameter>node</parameter> inside <parameter>array</parameter>. The array will take ownership of the
@@ -180,7 +180,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-array-get-element" role="function">
 <title>json_array_get_element ()</title>
-<indexterm zone="json-array-get-element"><primary sortas="json_array_get_element">json_array_get_element</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_array_get_element              (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-element"><primary sortas="array_get_element">json_array_get_element</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_array_get_element              (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Retrieves the <link linkend="JsonNode"><type>JsonNode</type></link> containing the value of the element at <parameter>index_</parameter>
@@ -198,7 +198,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-array-dup-element" role="function" condition="since:0.6">
 <title>json_array_dup_element ()</title>
-<indexterm zone="json-array-dup-element" role="0.6"><primary sortas="json_array_dup_element">json_array_dup_element</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_array_dup_element              (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-dup-element" role="0.6"><primary sortas="array_dup_element">json_array_dup_element</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_array_dup_element              (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Retrieves a copy of the <link linkend="JsonNode"><type>JsonNode</type></link> containing the value of the
@@ -211,14 +211,11 @@
 <varlistentry><term><parameter>index_</parameter>&#160;:</term>
 <listitem><simpara> the index of the element to retrieve
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a copy of the <link linkend="JsonNode"><type>JsonNode</type></link> at the requested index.
-  Use <link linkend="json-node-free"><function>json_node_free()</function></link> when done.
-
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>transfer full. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.6</para></refsect2>
 <refsect2 id="json-array-get-elements" role="function">
 <title>json_array_get_elements ()</title>
-<indexterm zone="json-array-get-elements"><primary sortas="json_array_get_elements">json_array_get_elements</primary></indexterm><programlisting><link linkend="GList">GList</link> *             json_array_get_elements             (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
+<indexterm zone="json-array-get-elements"><primary sortas="array_get_elements">json_array_get_elements</primary></indexterm><programlisting><link linkend="GList">GList</link> *             json_array_get_elements             (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
 <para>
 Gets the elements of a <link linkend="JsonArray"><type>JsonArray</type></link> as a list of <link linkend="JsonNode"><type>JsonNode</type></link><!-- -->s.</para>
 <para>
@@ -226,15 +223,11 @@
 <varlistentry><term><parameter>array</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonArray"><type>JsonArray</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="GList"><type>GList</type></link> containing the elements of the array. The
-  contents of the list are owned by the array and should never be
-  modified or freed. Use <link linkend="g-list-free"><function>g_list_free()</function></link> on the returned list when
-  done using it
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>element-type JsonNode) (transfer container. <acronym>element-type</acronym> JsonNode. <acronym>transfer</acronym> container. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-array-get-length" role="function">
 <title>json_array_get_length ()</title>
-<indexterm zone="json-array-get-length"><primary sortas="json_array_get_length">json_array_get_length</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_array_get_length               (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
+<indexterm zone="json-array-get-length"><primary sortas="array_get_length">json_array_get_length</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_array_get_length               (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
 <para>
 Retrieves the length of a <link linkend="JsonArray"><type>JsonArray</type></link></para>
 <para>
@@ -247,7 +240,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-array-remove-element" role="function">
 <title>json_array_remove_element ()</title>
-<indexterm zone="json-array-remove-element"><primary sortas="json_array_remove_element">json_array_remove_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_remove_element           (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-remove-element"><primary sortas="array_remove_element">json_array_remove_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_remove_element           (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Removes the <link linkend="JsonNode"><type>JsonNode</type></link> inside <parameter>array</parameter> at <parameter>index_</parameter> freeing its allocated
@@ -263,7 +256,7 @@
 </variablelist></refsect2>
 <refsect2 id="JsonArrayForeach" role="function" condition="since:0.8">
 <title>JsonArrayForeach ()</title>
-<indexterm zone="JsonArrayForeach" role="0.8"><primary sortas="JsonArrayForeach">JsonArrayForeach</primary></indexterm><programlisting><link linkend="void">void</link>                (*JsonArrayForeach)                 (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="JsonArrayForeach" role="0.8"><primary sortas="ArrayForeach">JsonArrayForeach</primary></indexterm><programlisting><link linkend="void">void</link>                (*JsonArrayForeach)                 (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_,
                                                          <link linkend="JsonNode">JsonNode</link> *element_node,
                                                          <link linkend="gpointer">gpointer</link> user_data);</programlisting>
@@ -288,7 +281,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-foreach-element" role="function" condition="since:0.8">
 <title>json_array_foreach_element ()</title>
-<indexterm zone="json-array-foreach-element" role="0.8"><primary sortas="json_array_foreach_element">json_array_foreach_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_foreach_element          (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-foreach-element" role="0.8"><primary sortas="array_foreach_element">json_array_foreach_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_foreach_element          (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="JsonArrayForeach">JsonArrayForeach</link> func,
                                                          <link linkend="gpointer">gpointer</link> data);</programlisting>
 <para>
@@ -308,12 +301,11 @@
 <listitem><simpara> the function to be called on each element
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara> data to be passed to the function
-</simpara></listitem></varlistentry>
+<listitem><simpara> data to be passed to the function. <acronym>allow-none</acronym>. </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-add-array-element" role="function" condition="since:0.8">
 <title>json_array_add_array_element ()</title>
-<indexterm zone="json-array-add-array-element" role="0.8"><primary sortas="json_array_add_array_element">json_array_add_array_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_array_element        (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-add-array-element" role="0.8"><primary sortas="array_add_array_element">json_array_add_array_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_array_element        (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="JsonArray">JsonArray</link> *value);</programlisting>
 <para>
 Conveniently adds an array into <parameter>array</parameter>. The <parameter>array</parameter> takes ownership
@@ -332,7 +324,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-get-array-element" role="function" condition="since:0.8">
 <title>json_array_get_array_element ()</title>
-<indexterm zone="json-array-get-array-element" role="0.8"><primary sortas="json_array_get_array_element">json_array_get_array_element</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_get_array_element        (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-array-element" role="0.8"><primary sortas="array_get_array_element">json_array_get_array_element</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_array_get_array_element        (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Conveniently retrieves the array from the element at <parameter>index_</parameter>
@@ -348,13 +340,11 @@
 <varlistentry><term><parameter>index_</parameter>&#160;:</term>
 <listitem><simpara> the index of the element to retrieve
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the array
-
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the array. <acronym>transfer</acronym> none. </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-add-boolean-element" role="function" condition="since:0.8">
 <title>json_array_add_boolean_element ()</title>
-<indexterm zone="json-array-add-boolean-element" role="0.8"><primary sortas="json_array_add_boolean_element">json_array_add_boolean_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_boolean_element      (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-add-boolean-element" role="0.8"><primary sortas="array_add_boolean_element">json_array_add_boolean_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_boolean_element      (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="gboolean">gboolean</link> value);</programlisting>
 <para>
 Conveniently adds a boolean <parameter>value</parameter> into <parameter>array</parameter>
@@ -372,7 +362,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-get-boolean-element" role="function" condition="since:0.8">
 <title>json_array_get_boolean_element ()</title>
-<indexterm zone="json-array-get-boolean-element" role="0.8"><primary sortas="json_array_get_boolean_element">json_array_get_boolean_element</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_array_get_boolean_element      (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-boolean-element" role="0.8"><primary sortas="array_get_boolean_element">json_array_get_boolean_element</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_array_get_boolean_element      (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Conveniently retrieves the boolean value of the element at <parameter>index_</parameter>
@@ -394,7 +384,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-add-double-element" role="function" condition="since:0.8">
 <title>json_array_add_double_element ()</title>
-<indexterm zone="json-array-add-double-element" role="0.8"><primary sortas="json_array_add_double_element">json_array_add_double_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_double_element       (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-add-double-element" role="0.8"><primary sortas="array_add_double_element">json_array_add_double_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_double_element       (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="gdouble">gdouble</link> value);</programlisting>
 <para>
 Conveniently adds a floating point <parameter>value</parameter> into <parameter>array</parameter>
@@ -412,7 +402,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-get-double-element" role="function" condition="since:0.8">
 <title>json_array_get_double_element ()</title>
-<indexterm zone="json-array-get-double-element" role="0.8"><primary sortas="json_array_get_double_element">json_array_get_double_element</primary></indexterm><programlisting><link linkend="gdouble">gdouble</link>             json_array_get_double_element       (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-double-element" role="0.8"><primary sortas="array_get_double_element">json_array_get_double_element</primary></indexterm><programlisting><link linkend="gdouble">gdouble</link>             json_array_get_double_element       (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Conveniently retrieves the floating point value of the element at
@@ -434,7 +424,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-add-int-element" role="function" condition="since:0.8">
 <title>json_array_add_int_element ()</title>
-<indexterm zone="json-array-add-int-element" role="0.8"><primary sortas="json_array_add_int_element">json_array_add_int_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_int_element          (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-add-int-element" role="0.8"><primary sortas="array_add_int_element">json_array_add_int_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_int_element          (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="gint64">gint64</link> value);</programlisting>
 <para>
 Conveniently adds an integer <parameter>value</parameter> into <parameter>array</parameter>
@@ -452,7 +442,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-get-int-element" role="function" condition="since:0.8">
 <title>json_array_get_int_element ()</title>
-<indexterm zone="json-array-get-int-element" role="0.8"><primary sortas="json_array_get_int_element">json_array_get_int_element</primary></indexterm><programlisting><link linkend="gint64">gint64</link>              json_array_get_int_element          (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-int-element" role="0.8"><primary sortas="array_get_int_element">json_array_get_int_element</primary></indexterm><programlisting><link linkend="gint64">gint64</link>              json_array_get_int_element          (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Conveniently retrieves the integer value of the element at <parameter>index_</parameter>
@@ -474,7 +464,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-add-null-element" role="function" condition="since:0.8">
 <title>json_array_add_null_element ()</title>
-<indexterm zone="json-array-add-null-element" role="0.8"><primary sortas="json_array_add_null_element">json_array_add_null_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_null_element         (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
+<indexterm zone="json-array-add-null-element" role="0.8"><primary sortas="array_add_null_element">json_array_add_null_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_null_element         (<link linkend="JsonArray">JsonArray</link> *array);</programlisting>
 <para>
 Conveniently adds a null element into <parameter>array</parameter>
 </para>
@@ -488,7 +478,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-get-null-element" role="function" condition="since:0.8">
 <title>json_array_get_null_element ()</title>
-<indexterm zone="json-array-get-null-element" role="0.8"><primary sortas="json_array_get_null_element">json_array_get_null_element</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_array_get_null_element         (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-null-element" role="0.8"><primary sortas="array_get_null_element">json_array_get_null_element</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_array_get_null_element         (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Conveniently retrieves whether the element at <parameter>index_</parameter> is set to null
@@ -509,7 +499,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-add-object-element" role="function" condition="since:0.8">
 <title>json_array_add_object_element ()</title>
-<indexterm zone="json-array-add-object-element" role="0.8"><primary sortas="json_array_add_object_element">json_array_add_object_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_object_element       (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-add-object-element" role="0.8"><primary sortas="array_add_object_element">json_array_add_object_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_object_element       (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="JsonObject">JsonObject</link> *value);</programlisting>
 <para>
 Conveniently adds an object into <parameter>array</parameter>. The <parameter>array</parameter> takes ownership
@@ -528,7 +518,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-get-object-element" role="function" condition="since:0.8">
 <title>json_array_get_object_element ()</title>
-<indexterm zone="json-array-get-object-element" role="0.8"><primary sortas="json_array_get_object_element">json_array_get_object_element</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_array_get_object_element       (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-object-element" role="0.8"><primary sortas="array_get_object_element">json_array_get_object_element</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_array_get_object_element       (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Conveniently retrieves the object from the element at <parameter>index_</parameter>
@@ -544,13 +534,11 @@
 <varlistentry><term><parameter>index_</parameter>&#160;:</term>
 <listitem><simpara> the index of the element to retrieve
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the object
-
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the object. <acronym>transfer</acronym> none. </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-add-string-element" role="function" condition="since:0.8">
 <title>json_array_add_string_element ()</title>
-<indexterm zone="json-array-add-string-element" role="0.8"><primary sortas="json_array_add_string_element">json_array_add_string_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_string_element       (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-add-string-element" role="0.8"><primary sortas="array_add_string_element">json_array_add_string_element</primary></indexterm><programlisting><link linkend="void">void</link>                json_array_add_string_element       (<link linkend="JsonArray">JsonArray</link> *array,
                                                          const <link linkend="gchar">gchar</link> *value);</programlisting>
 <para>
 Conveniently adds a string <parameter>value</parameter> into <parameter>array</parameter>
@@ -568,7 +556,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-array-get-string-element" role="function" condition="since:0.8">
 <title>json_array_get_string_element ()</title>
-<indexterm zone="json-array-get-string-element" role="0.8"><primary sortas="json_array_get_string_element">json_array_get_string_element</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_array_get_string_element       (<link linkend="JsonArray">JsonArray</link> *array,
+<indexterm zone="json-array-get-string-element" role="0.8"><primary sortas="array_get_string_element">json_array_get_string_element</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_array_get_string_element       (<link linkend="JsonArray">JsonArray</link> *array,
                                                          <link linkend="guint">guint</link> index_);</programlisting>
 <para>
 Conveniently retrieves the string value of the element at <parameter>index_</parameter>
diff -Nru json-glib-0.7.6/doc/reference/xml/json-gboxed.xml json-glib-0.10.2/doc/reference/xml/json-gboxed.xml
--- json-glib-0.7.6/doc/reference/xml/json-gboxed.xml	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-gboxed.xml	2010-02-26 14:05:46.000000000 +0000
@@ -0,0 +1,264 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
+
+<refentry id="json-glib-Boxed-Types-Serialization">
+<refmeta>
+<refentrytitle role="top_of_page" id="json-glib-Boxed-Types-Serialization.top_of_page">Boxed Types Serialization</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>JSON-GLIB Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Boxed Types Serialization</refname>
+<refpurpose>Serialize and deserialize GBoxed types</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="json-glib-Boxed-Types-Serialization.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>
+<link linkend="JsonNode">JsonNode</link> *          (<link linkend="JsonBoxedSerializeFunc">*JsonBoxedSerializeFunc</link>)           (<link linkend="gconstpointer">gconstpointer</link> boxed);
+<link linkend="gpointer">gpointer</link>            (<link linkend="JsonBoxedDeserializeFunc">*JsonBoxedDeserializeFunc</link>)         (<link linkend="JsonNode">JsonNode</link> *node);
+<link linkend="void">void</link>                <link linkend="json-boxed-register-serialize-func">json_boxed_register_serialize_func</link>  (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> node_type,
+                                                         <link linkend="JsonBoxedSerializeFunc">JsonBoxedSerializeFunc</link> serialize_func);
+<link linkend="void">void</link>                <link linkend="json-boxed-register-deserialize-func">json_boxed_register_deserialize_func</link>
+                                                        (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> node_type,
+                                                         <link linkend="JsonBoxedDeserializeFunc">JsonBoxedDeserializeFunc</link> deserialize_func);
+
+<link linkend="gboolean">gboolean</link>            <link linkend="json-boxed-can-serialize">json_boxed_can_serialize</link>            (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> *node_type);
+<link linkend="gboolean">gboolean</link>            <link linkend="json-boxed-can-deserialize">json_boxed_can_deserialize</link>          (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> node_type);
+<link linkend="JsonNode">JsonNode</link> *          <link linkend="json-boxed-serialize">json_boxed_serialize</link>                (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="gconstpointer">gconstpointer</link> boxed);
+<link linkend="gpointer">gpointer</link>            <link linkend="json-boxed-deserialize">json_boxed_deserialize</link>              (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNode">JsonNode</link> *node);
+</synopsis>
+</refsynopsisdiv>
+
+
+
+
+
+
+
+
+
+<refsect1 id="json-glib-Boxed-Types-Serialization.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+GLib's <link linkend="GBoxed"><type>GBoxed</type></link> type is a generic wrapper for arbitrary C structures.
+</para>
+<para>
+JSON-GLib allows serialization and deserialization of a <link linkend="GBoxed"><type>GBoxed</type></link> type
+by registering functions mapping a <link linkend="JsonNodeType"><type>JsonNodeType</type></link> to a specific
+<link linkend="GType"><type>GType</type></link>.
+</para>
+<para>
+When registering a <link linkend="GBoxed"><type>GBoxed</type></link> type you should also register the
+corresponding transformation functions, e.g.:
+</para>
+<para>
+<informalexample><programlisting>
+  GType
+  my_struct_get_type (void)
+  {
+    static GType boxed_type = 0;
+
+    if (boxed_type == 0)
+      {
+        boxed_type =
+          g_boxed_type_register_static (g_intern_static_string ("MyStruct"),
+                                        (GBoxedCopyFunc) my_struct_copy,
+                                        (GBoxedFreeFunc) my_struct_free);
+
+        json_boxed_register_serialize_func (boxed_type, JSON_NODE_OBJECT,
+                                            my_struct_serialize);
+        json_boxed_register_deserialize_func (boxed_type, JSON_NODE_OBJECT,
+                                              my_struct_deserialize);
+      }
+
+    return boxed_type;
+  }
+</programlisting></informalexample>
+</para>
+<para>
+The serialization function will be invoked by <link linkend="json-boxed-serialize"><function>json_boxed_serialize()</function></link>:
+it will be passed a pointer to the C structure and it must return a
+<link linkend="JsonNode"><type>JsonNode</type></link>. The deserialization function will be invoked by
+<link linkend="json-boxed-deserialize"><function>json_boxed_deserialize()</function></link>: it will be passed a <link linkend="JsonNode"><type>JsonNode</type></link> for the
+declared type and it must return a newly allocated C structure.
+</para>
+<para>
+It is possible to check whether a <link linkend="GBoxed"><type>GBoxed</type></link> type can be deserialized
+from a specific <link linkend="JsonNodeType"><type>JsonNodeType</type></link>, and whether a <link linkend="GBoxed"><type>GBoxed</type></link> can be serialized
+and to which specific <link linkend="JsonNodeType"><type>JsonNodeType</type></link>.</para>
+<para>
+</para>
+</refsect1>
+
+<refsect1 id="json-glib-Boxed-Types-Serialization.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="JsonBoxedSerializeFunc" role="function" condition="since:0.10">
+<title>JsonBoxedSerializeFunc ()</title>
+<indexterm zone="JsonBoxedSerializeFunc" role="0.10"><primary sortas="BoxedSerializeFunc">JsonBoxedSerializeFunc</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          (*JsonBoxedSerializeFunc)           (<link linkend="gconstpointer">gconstpointer</link> boxed);</programlisting>
+<para>
+Serializes the passed <link linkend="GBoxed"><type>GBoxed</type></link> and stores it inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>boxed</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="GBoxed"><type>GBoxed</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the newly created <link linkend="JsonNode"><type>JsonNode</type></link>
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="JsonBoxedDeserializeFunc" role="function" condition="since:0.10">
+<title>JsonBoxedDeserializeFunc ()</title>
+<indexterm zone="JsonBoxedDeserializeFunc" role="0.10"><primary sortas="BoxedDeserializeFunc">JsonBoxedDeserializeFunc</primary></indexterm><programlisting><link linkend="gpointer">gpointer</link>            (*JsonBoxedDeserializeFunc)         (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<para>
+Deserializes the contents of the passed <link linkend="JsonNode"><type>JsonNode</type></link> into a <link linkend="GBoxed"><type>GBoxed</type></link></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the newly created boxed type
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-boxed-register-serialize-func" role="function" condition="since:0.10">
+<title>json_boxed_register_serialize_func ()</title>
+<indexterm zone="json-boxed-register-serialize-func" role="0.10"><primary sortas="boxed_register_serialize_func">json_boxed_register_serialize_func</primary></indexterm><programlisting><link linkend="void">void</link>                json_boxed_register_serialize_func  (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> node_type,
+                                                         <link linkend="JsonBoxedSerializeFunc">JsonBoxedSerializeFunc</link> serialize_func);</programlisting>
+<para>
+Registers a serialization function for a <link linkend="GBoxed"><type>GBoxed</type></link> of type <parameter>gboxed_type</parameter>
+to a <link linkend="JsonNode"><type>JsonNode</type></link> of type <parameter>node_type</parameter></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gboxed_type</parameter>&#160;:</term>
+<listitem><simpara> a boxed type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>node_type</parameter>&#160;:</term>
+<listitem><simpara> a node type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>serialize_func</parameter>&#160;:</term>
+<listitem><simpara> serialization function for <parameter>boxed_type</parameter> into
+  a <link linkend="JsonNode"><type>JsonNode</type></link> of type <parameter>node_type</parameter>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-boxed-register-deserialize-func" role="function" condition="since:0.10">
+<title>json_boxed_register_deserialize_func ()</title>
+<indexterm zone="json-boxed-register-deserialize-func" role="0.10"><primary sortas="boxed_register_deserialize_func">json_boxed_register_deserialize_func</primary></indexterm><programlisting><link linkend="void">void</link>                json_boxed_register_deserialize_func
+                                                        (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> node_type,
+                                                         <link linkend="JsonBoxedDeserializeFunc">JsonBoxedDeserializeFunc</link> deserialize_func);</programlisting>
+<para>
+Registers a deserialization function for a <link linkend="GBoxed"><type>GBoxed</type></link> of type <parameter>gboxed_type</parameter>
+from a <link linkend="JsonNode"><type>JsonNode</type></link> of type <parameter>node_type</parameter></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gboxed_type</parameter>&#160;:</term>
+<listitem><simpara> a boxed type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>node_type</parameter>&#160;:</term>
+<listitem><simpara> a node type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>deserialize_func</parameter>&#160;:</term>
+<listitem><simpara> deserialization function for <parameter>boxed_type</parameter> from
+  a <link linkend="JsonNode"><type>JsonNode</type></link> of type <parameter>node_type</parameter>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-boxed-can-serialize" role="function" condition="since:0.10">
+<title>json_boxed_can_serialize ()</title>
+<indexterm zone="json-boxed-can-serialize" role="0.10"><primary sortas="boxed_can_serialize">json_boxed_can_serialize</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_boxed_can_serialize            (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> *node_type);</programlisting>
+<para>
+Checks whether it is possible to serialize a <link linkend="GBoxed"><type>GBoxed</type></link> of
+type <parameter>gboxed_type</parameter> into a <link linkend="JsonNode"><type>JsonNode</type></link>. The type of the
+<link linkend="JsonNode"><type>JsonNode</type></link> is placed inside <parameter>node_type</parameter> if the function
+returns <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> and it's undefined otherwise.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gboxed_type</parameter>&#160;:</term>
+<listitem><simpara> a boxed type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>node_type</parameter>&#160;:</term>
+<listitem><simpara>out. <acronym>out</acronym>. </simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the type can be serialized,
+  and <link linkend="FALSE--CAPS"><literal>FALSE</literal></link> otherwise.
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-boxed-can-deserialize" role="function" condition="since:0.10">
+<title>json_boxed_can_deserialize ()</title>
+<indexterm zone="json-boxed-can-deserialize" role="0.10"><primary sortas="boxed_can_deserialize">json_boxed_can_deserialize</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_boxed_can_deserialize          (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNodeType">JsonNodeType</link> node_type);</programlisting>
+<para>
+Checks whether it is possible to deserialize a <link linkend="GBoxed"><type>GBoxed</type></link> of
+type <parameter>gboxed_type</parameter> from a <link linkend="JsonNode"><type>JsonNode</type></link> of type <parameter>node_type</parameter></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gboxed_type</parameter>&#160;:</term>
+<listitem><simpara> a boxed type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>node_type</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> type
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the type can be deserialized, <link linkend="FALSE--CAPS"><literal>FALSE</literal></link> otherwise
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-boxed-serialize" role="function" condition="since:0.10">
+<title>json_boxed_serialize ()</title>
+<indexterm zone="json-boxed-serialize" role="0.10"><primary sortas="boxed_serialize">json_boxed_serialize</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_boxed_serialize                (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="gconstpointer">gconstpointer</link> boxed);</programlisting>
+<para>
+Serializes <parameter>boxed</parameter>, a pointer to a <link linkend="GBoxed"><type>GBoxed</type></link> of type <parameter>gboxed_type</parameter>,
+into a <link linkend="JsonNode"><type>JsonNode</type></link></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gboxed_type</parameter>&#160;:</term>
+<listitem><simpara> a boxed type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>boxed</parameter>&#160;:</term>
+<listitem><simpara> a pointer to a <link linkend="GBoxed"><type>GBoxed</type></link> of type <parameter>gboxed_type</parameter>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> with the serialization of the boxed
+  type, or <link linkend="NULL--CAPS"><literal>NULL</literal></link> if serialization either failed or was not
+  possible
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-boxed-deserialize" role="function" condition="since:0.10">
+<title>json_boxed_deserialize ()</title>
+<indexterm zone="json-boxed-deserialize" role="0.10"><primary sortas="boxed_deserialize">json_boxed_deserialize</primary></indexterm><programlisting><link linkend="gpointer">gpointer</link>            json_boxed_deserialize              (<link linkend="GType">GType</link> gboxed_type,
+                                                         <link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<para>
+Deserializes <parameter>node</parameter> into a <link linkend="GBoxed"><type>GBoxed</type></link> of <parameter>gboxed_type</parameter></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gboxed_type</parameter>&#160;:</term>
+<listitem><simpara> a boxed type
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the newly allocated <link linkend="GBoxed"><type>GBoxed</type></link>. Use <link linkend="g-boxed-free"><function>g_boxed_free()</function></link> to
+  release the resources allocated by this function
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+
+</refsect1>
+
+
+
+
+</refentry>
diff -Nru json-glib-0.7.6/doc/reference/xml/json-generator.xml json-glib-0.10.2/doc/reference/xml/json-generator.xml
--- json-glib-0.7.6/doc/reference/xml/json-generator.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-generator.xml	2010-02-26 14:05:46.000000000 +0000
@@ -70,7 +70,7 @@
 <title role="details.title">Details</title>
 <refsect2 id="JsonGenerator-struct" role="struct">
 <title>JsonGenerator</title>
-<indexterm zone="JsonGenerator-struct"><primary sortas="JsonGenerator">JsonGenerator</primary></indexterm><programlisting>typedef struct _JsonGenerator JsonGenerator;</programlisting>
+<indexterm zone="JsonGenerator-struct"><primary sortas="Generator">JsonGenerator</primary></indexterm><programlisting>typedef struct _JsonGenerator JsonGenerator;</programlisting>
 <para>
 JSON data streams generator. The contents of the <link linkend="JsonGenerator"><type>JsonGenerator</type></link> structure
 are private and should only be accessed via the provided API.</para>
@@ -78,7 +78,7 @@
 </para></refsect2>
 <refsect2 id="JsonGeneratorClass" role="struct">
 <title>JsonGeneratorClass</title>
-<indexterm zone="JsonGeneratorClass"><primary sortas="JsonGeneratorClass">JsonGeneratorClass</primary></indexterm><programlisting>typedef struct {
+<indexterm zone="JsonGeneratorClass"><primary sortas="GeneratorClass">JsonGeneratorClass</primary></indexterm><programlisting>typedef struct {
 } JsonGeneratorClass;
 </programlisting>
 <para>
@@ -87,7 +87,7 @@
 </para></refsect2>
 <refsect2 id="json-generator-new" role="function">
 <title>json_generator_new ()</title>
-<indexterm zone="json-generator-new"><primary sortas="json_generator_new">json_generator_new</primary></indexterm><programlisting><link linkend="JsonGenerator">JsonGenerator</link> *     json_generator_new                  (void);</programlisting>
+<indexterm zone="json-generator-new"><primary sortas="generator_new">json_generator_new</primary></indexterm><programlisting><link linkend="JsonGenerator">JsonGenerator</link> *     json_generator_new                  (void);</programlisting>
 <para>
 Creates a new <link linkend="JsonGenerator"><type>JsonGenerator</type></link>. You can use this object to generate a
 JSON data stream starting from a data object model composed by
@@ -99,7 +99,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-generator-to-file" role="function">
 <title>json_generator_to_file ()</title>
-<indexterm zone="json-generator-to-file"><primary sortas="json_generator_to_file">json_generator_to_file</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_generator_to_file              (<link linkend="JsonGenerator">JsonGenerator</link> *generator,
+<indexterm zone="json-generator-to-file"><primary sortas="generator_to_file">json_generator_to_file</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_generator_to_file              (<link linkend="JsonGenerator">JsonGenerator</link> *generator,
                                                          const <link linkend="gchar">gchar</link> *filename,
                                                          <link linkend="GError">GError</link> **error);</programlisting>
 <para>
@@ -121,7 +121,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-generator-to-data" role="function">
 <title>json_generator_to_data ()</title>
-<indexterm zone="json-generator-to-data"><primary sortas="json_generator_to_data">json_generator_to_data</primary></indexterm><programlisting><link linkend="gchar">gchar</link> *             json_generator_to_data              (<link linkend="JsonGenerator">JsonGenerator</link> *generator,
+<indexterm zone="json-generator-to-data"><primary sortas="generator_to_data">json_generator_to_data</primary></indexterm><programlisting><link linkend="gchar">gchar</link> *             json_generator_to_data              (<link linkend="JsonGenerator">JsonGenerator</link> *generator,
                                                          <link linkend="gsize">gsize</link> *length);</programlisting>
 <para>
 Generates a JSON data stream from <parameter>generator</parameter> and returns it as a
@@ -132,23 +132,22 @@
 <listitem><simpara> a <link linkend="JsonGenerator"><type>JsonGenerator</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>length</parameter>&#160;:</term>
-<listitem><simpara> return location for the length of the returned buffer, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a newly allocated buffer holding a JSON data stream. Use
-  <link linkend="g-free"><function>g_free()</function></link> to free the allocated resources.
+<listitem><simpara>out. <acronym>out</acronym>. </simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a newly allocated buffer holding a JSON data stream.
+  Use <link linkend="g-free"><function>g_free()</function></link> to free the allocated resources.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-generator-set-root" role="function">
 <title>json_generator_set_root ()</title>
-<indexterm zone="json-generator-set-root"><primary sortas="json_generator_set_root">json_generator_set_root</primary></indexterm><programlisting><link linkend="void">void</link>                json_generator_set_root             (<link linkend="JsonGenerator">JsonGenerator</link> *generator,
+<indexterm zone="json-generator-set-root"><primary sortas="generator_set_root">json_generator_set_root</primary></indexterm><programlisting><link linkend="void">void</link>                json_generator_set_root             (<link linkend="JsonGenerator">JsonGenerator</link> *generator,
                                                          <link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Sets <parameter>node</parameter> as the root of the JSON data stream to be serialized by
 the <link linkend="JsonGenerator"><type>JsonGenerator</type></link>.
 </para>
 <para>
-Note: the node is copied by the generator object, so it can be safely
-freed after calling this function.</para>
+<note>The node is copied by the generator object, so it can be safely
+freed after calling this function.</note></para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>generator</parameter>&#160;:</term>
@@ -163,14 +162,14 @@
 <refsect1 id="JsonGenerator.property-details" role="property_details">
 <title role="property_details.title">Property Details</title>
 <refsect2 id="JsonGenerator--indent" role="property"><title>The <literal>&quot;indent&quot;</literal> property</title>
-<indexterm zone="JsonGenerator--indent"><primary sortas="JsonGenerator:indent">JsonGenerator:indent</primary></indexterm><programlisting>  &quot;indent&quot;                   <link linkend="guint">guint</link>                 : Read / Write</programlisting>
+<indexterm zone="JsonGenerator--indent"><primary sortas="Generator:indent">JsonGenerator:indent</primary></indexterm><programlisting>  &quot;indent&quot;                   <link linkend="guint">guint</link>                 : Read / Write</programlisting>
 <para>
 Number of spaces to be used to indent when pretty printing.</para>
 <para>
 </para><para>Default value: 2</para>
 </refsect2>
 <refsect2 id="JsonGenerator--indent-char" role="property"><title>The <literal>&quot;indent-char&quot;</literal> property</title>
-<indexterm zone="JsonGenerator--indent-char" role="0.6"><primary sortas="JsonGenerator:indent-char">JsonGenerator:indent-char</primary></indexterm><programlisting>  &quot;indent-char&quot;              <link linkend="guint">guint</link>                 : Read / Write</programlisting>
+<indexterm zone="JsonGenerator--indent-char" role="0.6"><primary sortas="Generator:indent-char">JsonGenerator:indent-char</primary></indexterm><programlisting>  &quot;indent-char&quot;              <link linkend="guint">guint</link>                 : Read / Write</programlisting>
 <para>
 The character that should be used when indenting in pretty print.</para>
 <para>
@@ -178,7 +177,7 @@
 <para>Since 0.6</para>
 </refsect2>
 <refsect2 id="JsonGenerator--pretty" role="property"><title>The <literal>&quot;pretty&quot;</literal> property</title>
-<indexterm zone="JsonGenerator--pretty"><primary sortas="JsonGenerator:pretty">JsonGenerator:pretty</primary></indexterm><programlisting>  &quot;pretty&quot;                   <link linkend="gboolean">gboolean</link>              : Read / Write</programlisting>
+<indexterm zone="JsonGenerator--pretty"><primary sortas="Generator:pretty">JsonGenerator:pretty</primary></indexterm><programlisting>  &quot;pretty&quot;                   <link linkend="gboolean">gboolean</link>              : Read / Write</programlisting>
 <para>
 Whether the output should be "pretty-printed", with indentation and
 newlines. The indentation level can be controlled by using the
@@ -187,7 +186,7 @@
 </para><para>Default value: FALSE</para>
 </refsect2>
 <refsect2 id="JsonGenerator--root" role="property"><title>The <literal>&quot;root&quot;</literal> property</title>
-<indexterm zone="JsonGenerator--root" role="0.4"><primary sortas="JsonGenerator:root">JsonGenerator:root</primary></indexterm><programlisting>  &quot;root&quot;                     <link linkend="JsonNode">JsonNode</link>*             : Read / Write</programlisting>
+<indexterm zone="JsonGenerator--root" role="0.4"><primary sortas="Generator:root">JsonGenerator:root</primary></indexterm><programlisting>  &quot;root&quot;                     <link linkend="JsonNode">JsonNode</link>*             : Read / Write</programlisting>
 <para>
 The root <link linkend="JsonNode"><type>JsonNode</type></link> to be used when constructing a JSON data
 stream.</para>
diff -Nru json-glib-0.7.6/doc/reference/xml/json-gobject.xml json-glib-0.10.2/doc/reference/xml/json-gobject.xml
--- json-glib-0.7.6/doc/reference/xml/json-gobject.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-gobject.xml	2010-02-26 14:05:46.000000000 +0000
@@ -4,41 +4,38 @@
 <!ENTITY version SYSTEM "version.xml">
 ]>
 
-<refentry id="json-glib-GObject-integration">
+<refentry id="json-glib-GObject-Serialization">
 <refmeta>
-<refentrytitle role="top_of_page" id="json-glib-GObject-integration.top_of_page">GObject integration</refentrytitle>
+<refentrytitle role="top_of_page" id="json-glib-GObject-Serialization.top_of_page">GObject Serialization</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>JSON-GLIB Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>GObject integration</refname>
+<refname>GObject Serialization</refname>
 <refpurpose>Serialize and deserialize GObjects</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv id="json-glib-GObject-integration.synopsis" role="synopsis">
+<refsynopsisdiv id="json-glib-GObject-Serialization.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-                    <link linkend="JsonSerializableIface">JsonSerializableIface</link>;
-<link linkend="JsonNode">JsonNode</link> *          <link linkend="json-serializable-serialize-property">json_serializable_serialize_property</link>
-                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
-                                                         const <link linkend="gchar">gchar</link> *property_name,
-                                                         const <link linkend="GValue">GValue</link> *value,
-                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec);
-<link linkend="gboolean">gboolean</link>            <link linkend="json-serializable-deserialize-property">json_serializable_deserialize_property</link>
-                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
-                                                         const <link linkend="gchar">gchar</link> *property_name,
-                                                         <link linkend="GValue">GValue</link> *value,
-                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec,
-                                                         <link linkend="JsonNode">JsonNode</link> *property_node);
-
-<link linkend="gchar">gchar</link> *             <link linkend="json-serialize-gobject">json_serialize_gobject</link>              (<link linkend="GObject">GObject</link> *gobject,
+<link linkend="JsonNode">JsonNode</link> *          <link linkend="json-gobject-serialize">json_gobject_serialize</link>              (<link linkend="GObject">GObject</link> *gobject);
+<link linkend="GObject">GObject</link> *           <link linkend="json-gobject-deserialize">json_gobject_deserialize</link>            (<link linkend="GType">GType</link> gtype,
+                                                         <link linkend="JsonNode">JsonNode</link> *node);
+<link linkend="gchar">gchar</link> *             <link linkend="json-gobject-to-data">json_gobject_to_data</link>                (<link linkend="GObject">GObject</link> *gobject,
                                                          <link linkend="gsize">gsize</link> *length);
+<link linkend="GObject">GObject</link> *           <link linkend="json-gobject-from-data">json_gobject_from_data</link>              (<link linkend="GType">GType</link> gtype,
+                                                         const <link linkend="gchar">gchar</link> *data,
+                                                         <link linkend="gssize">gssize</link> length,
+                                                         <link linkend="GError">GError</link> **error);
+
 <link linkend="GObject">GObject</link> *           <link linkend="json-construct-gobject">json_construct_gobject</link>              (<link linkend="GType">GType</link> gtype,
                                                          const <link linkend="gchar">gchar</link> *data,
                                                          <link linkend="gsize">gsize</link> length,
                                                          <link linkend="GError">GError</link> **error);
+<link linkend="gchar">gchar</link> *             <link linkend="json-serialize-gobject">json_serialize_gobject</link>              (<link linkend="GObject">GObject</link> *gobject,
+                                                         <link linkend="gsize">gsize</link> *length);
 </synopsis>
 </refsynopsisdiv>
 
@@ -50,7 +47,7 @@
 
 
 
-<refsect1 id="json-glib-GObject-integration.description" role="desc">
+<refsect1 id="json-glib-GObject-Serialization.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 JSON-GLib provides API for serializing and deserializing <link linkend="GObject"><type>GObject</type></link><!-- -->s
@@ -67,127 +64,104 @@
 </para>
 </refsect1>
 
-<refsect1 id="json-glib-GObject-integration.details" role="details">
+<refsect1 id="json-glib-GObject-Serialization.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="JsonSerializableIface" role="struct">
-<title>JsonSerializableIface</title>
-<indexterm zone="JsonSerializableIface"><primary sortas="JsonSerializableIface">JsonSerializableIface</primary></indexterm><programlisting>typedef struct {
-  JsonNode *(* serialize_property)   (JsonSerializable *serializable,
-                                      const gchar      *property_name,
-                                      const GValue     *value,
-                                      GParamSpec       *pspec);
-  gboolean  (* deserialize_property) (JsonSerializable *serializable,
-                                      const gchar      *property_name,
-                                      GValue           *value,
-                                      GParamSpec       *pspec,
-                                      JsonNode         *property_node);
-} JsonSerializableIface;
-</programlisting>
-<para>
-Interface that allows serializing and deserializing <link linkend="GObject"><type>GObject</type></link><!-- -->s
-with properties storing complex data types. The <link linkend="json-serialize-gobject"><function>json_serialize_gobject()</function></link>
-function will check if the passed <link linkend="GObject"><type>GObject</type></link> implements this interface,
-so it can also be used to override the default property serialization
-sequence.</para>
-<para>
-</para><variablelist role="struct">
-<varlistentry>
-<term><structfield>serialize_property</structfield>&#160;()</term>
-<listitem><simpara> virtual function for serializing a <link linkend="GObject"><type>GObject</type></link> property
-  into a <link linkend="JsonNode"><type>JsonNode</type></link>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><structfield>deserialize_property</structfield>&#160;()</term>
-<listitem><simpara> virtual function for deserializing a <link linkend="JsonNode"><type>JsonNode</type></link>
-  into a <link linkend="GObject"><type>GObject</type></link> property
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="json-serializable-serialize-property" role="function">
-<title>json_serializable_serialize_property ()</title>
-<indexterm zone="json-serializable-serialize-property"><primary sortas="json_serializable_serialize_property">json_serializable_serialize_property</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_serializable_serialize_property
-                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
-                                                         const <link linkend="gchar">gchar</link> *property_name,
-                                                         const <link linkend="GValue">GValue</link> *value,
-                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec);</programlisting>
-<para>
-Asks a <link linkend="JsonSerializable"><type>JsonSerializable</type></link> implementation to serialize a <link linkend="GObject"><type>GObject</type></link>
-property into a <link linkend="JsonNode"><type>JsonNode</type></link> object.</para>
+<refsect2 id="json-gobject-serialize" role="function" condition="since:0.10">
+<title>json_gobject_serialize ()</title>
+<indexterm zone="json-gobject-serialize" role="0.10"><primary sortas="gobject_serialize">json_gobject_serialize</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_gobject_serialize              (<link linkend="GObject">GObject</link> *gobject);</programlisting>
+<para>
+Creates a <link linkend="JsonNode"><type>JsonNode</type></link> representing the passed <link linkend="GObject"><type>GObject</type></link>
+instance. Each member of the returned JSON object will
+map to a property of the <link linkend="GObject"><type>GObject</type></link></para>
 <para>
 </para><variablelist role="params">
-<varlistentry><term><parameter>serializable</parameter>&#160;:</term>
-<listitem><simpara> a <link linkend="JsonSerializable"><type>JsonSerializable</type></link> object
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>property_name</parameter>&#160;:</term>
-<listitem><simpara> the name of the property
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara> the value of the property
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pspec</parameter>&#160;:</term>
-<listitem><simpara> a <link linkend="GParamSpec"><type>GParamSpec</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> containing the serialize property
+<varlistentry><term><parameter>gobject</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="GObject"><type>GObject</type></link>
 </simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="json-serializable-deserialize-property" role="function">
-<title>json_serializable_deserialize_property ()</title>
-<indexterm zone="json-serializable-deserialize-property"><primary sortas="json_serializable_deserialize_property">json_serializable_deserialize_property</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_serializable_deserialize_property
-                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
-                                                         const <link linkend="gchar">gchar</link> *property_name,
-                                                         <link linkend="GValue">GValue</link> *value,
-                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec,
-                                                         <link linkend="JsonNode">JsonNode</link> *property_node);</programlisting>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>transfer full. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-gobject-deserialize" role="function" condition="since:0.10">
+<title>json_gobject_deserialize ()</title>
+<indexterm zone="json-gobject-deserialize" role="0.10"><primary sortas="gobject_deserialize">json_gobject_deserialize</primary></indexterm><programlisting><link linkend="GObject">GObject</link> *           json_gobject_deserialize            (<link linkend="GType">GType</link> gtype,
+                                                         <link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
-Asks a <link linkend="JsonSerializable"><type>JsonSerializable</type></link> implementation to deserialize the
-property contained inside <parameter>property_node</parameter> into <parameter>value</parameter>.</para>
+Creates a new <link linkend="GObject"><type>GObject</type></link> of type <parameter>gtype</parameter>, and constructs it
+using the members of the passed <link linkend="JsonObject"><type>JsonObject</type></link></para>
 <para>
 </para><variablelist role="params">
-<varlistentry><term><parameter>serializable</parameter>&#160;:</term>
-<listitem><simpara> a <link linkend="JsonSerializable"><type>JsonSerializable</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>property_name</parameter>&#160;:</term>
-<listitem><simpara> the name of the property
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara> a pointer to an uninitialized <link linkend="GValue"><type>GValue</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pspec</parameter>&#160;:</term>
-<listitem><simpara> a <link linkend="GParamSpec"><type>GParamSpec</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>property_node</parameter>&#160;:</term>
-<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> containing the serialized property
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the property was successfully deserialized.
+<varlistentry><term><parameter>gtype</parameter>&#160;:</term>
+<listitem><simpara> the type of the <link linkend="GObject"><type>GObject</type></link> to create
 </simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="json-serialize-gobject" role="function">
-<title>json_serialize_gobject ()</title>
-<indexterm zone="json-serialize-gobject"><primary sortas="json_serialize_gobject">json_serialize_gobject</primary></indexterm><programlisting><link linkend="gchar">gchar</link> *             json_serialize_gobject              (<link linkend="GObject">GObject</link> *gobject,
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> of type <link linkend="JSON-NODE-OBJECT--CAPS"><literal>JSON_NODE_OBJECT</literal></link> describing the
+  instance of type <parameter>gtype</parameter>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>transfer full. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-gobject-to-data" role="function" condition="since:0.10">
+<title>json_gobject_to_data ()</title>
+<indexterm zone="json-gobject-to-data" role="0.10"><primary sortas="gobject_to_data">json_gobject_to_data</primary></indexterm><programlisting><link linkend="gchar">gchar</link> *             json_gobject_to_data                (<link linkend="GObject">GObject</link> *gobject,
                                                          <link linkend="gsize">gsize</link> *length);</programlisting>
 <para>
-Serializes a <link linkend="GObject"><type>GObject</type></link> into a JSON data stream. If <parameter>gobject</parameter> implements
-the <link linkend="JsonSerializableIface"><type>JsonSerializableIface</type></link> interface, it will be asked to serizalize all
-its properties; otherwise, the default implementation will be use to
-translate the compatible types into JSON native types.</para>
+Serializes a <link linkend="GObject"><type>GObject</type></link> into a JSON data stream, iterating recursively
+over each property.
+</para>
+<para>
+If <parameter>gobject</parameter> implements the <link linkend="JsonSerializableIface"><type>JsonSerializableIface</type></link> interface, it will
+be asked to serialize all its properties; otherwise, the default
+implementation will be use to translate the compatible types into
+JSON native types.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>gobject</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="GObject"><type>GObject</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>length</parameter>&#160;:</term>
-<listitem><simpara> return value for the length of the buffer, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
-</simpara></listitem></varlistentry>
+<listitem><simpara> return value for the length of the buffer, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>. <acronym>out</acronym>. </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a JSON data stream representing the passed <link linkend="GObject"><type>GObject</type></link>
+
 </simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="json-construct-gobject" role="function" condition="since:0.4">
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-gobject-from-data" role="function" condition="since:0.10">
+<title>json_gobject_from_data ()</title>
+<indexterm zone="json-gobject-from-data" role="0.10"><primary sortas="gobject_from_data">json_gobject_from_data</primary></indexterm><programlisting><link linkend="GObject">GObject</link> *           json_gobject_from_data              (<link linkend="GType">GType</link> gtype,
+                                                         const <link linkend="gchar">gchar</link> *data,
+                                                         <link linkend="gssize">gssize</link> length,
+                                                         <link linkend="GError">GError</link> **error);</programlisting>
+<para>
+Deserializes a JSON data stream and creates the corresponding
+<link linkend="GObject"><type>GObject</type></link> class. If <parameter>gtype</parameter> implements the <link linkend="JsonSerializableIface"><type>JsonSerializableIface</type></link>
+interface, it will be asked to deserialize all the JSON members
+into the respective properties; otherwise, the default implementation
+will be used to translate the compatible JSON native types.
+</para>
+<para>
+Note: the JSON data stream must be an object declaration.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gtype</parameter>&#160;:</term>
+<listitem><simpara> the <link linkend="GType"><type>GType</type></link> of object to construct
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara> a JSON data stream
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>length</parameter>&#160;:</term>
+<listitem><simpara> length of the data stream, or -1 if it is NUL-terminated
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>error</parameter>&#160;:</term>
+<listitem><simpara> return location for a <link linkend="GError"><type>GError</type></link>, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="GObject"><type>GObject</type></link> or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-construct-gobject" role="function" condition="deprecated:0.10: Use json_gobject_from_data() instead|since:0.4">
 <title>json_construct_gobject ()</title>
-<indexterm zone="json-construct-gobject" role="0.4"><primary sortas="json_construct_gobject">json_construct_gobject</primary></indexterm><programlisting><link linkend="GObject">GObject</link> *           json_construct_gobject              (<link linkend="GType">GType</link> gtype,
+<indexterm zone="json-construct-gobject" role="deprecated"><primary sortas="construct_gobject">json_construct_gobject</primary></indexterm><indexterm zone="json-construct-gobject" role="0.4"><primary sortas="construct_gobject">json_construct_gobject</primary></indexterm><programlisting><link linkend="GObject">GObject</link> *           json_construct_gobject              (<link linkend="GType">GType</link> gtype,
                                                          const <link linkend="gchar">gchar</link> *data,
                                                          <link linkend="gsize">gsize</link> length,
                                                          <link linkend="GError">GError</link> **error);</programlisting>
+<warning><para><literal>json_construct_gobject</literal> has been deprecated since version 0.10 and should not be used in newly-written code. Use <link linkend="json-gobject-from-data"><function>json_gobject_from_data()</function></link> instead</para></warning>
 <para>
 Deserializes a JSON data stream and creates the corresponding
 <link linkend="GObject"><type>GObject</type></link> class. If <parameter>gtype</parameter> implements the <link linkend="JsonSerializableIface"><type>JsonSerializableIface</type></link>
@@ -206,7 +180,7 @@
 <listitem><simpara> a JSON data stream
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>length</parameter>&#160;:</term>
-<listitem><simpara> length of the data stream, or -1 if it is NUL-terminated
+<listitem><simpara> length of the data stream
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>error</parameter>&#160;:</term>
 <listitem><simpara> return location for a <link linkend="GError"><type>GError</type></link>, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
@@ -215,6 +189,27 @@
 
 </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.4</para></refsect2>
+<refsect2 id="json-serialize-gobject" role="function" condition="deprecated:0.10: Use json_gobject_to_data() instead">
+<title>json_serialize_gobject ()</title>
+<indexterm zone="json-serialize-gobject" role="deprecated"><primary sortas="serialize_gobject">json_serialize_gobject</primary></indexterm><programlisting><link linkend="gchar">gchar</link> *             json_serialize_gobject              (<link linkend="GObject">GObject</link> *gobject,
+                                                         <link linkend="gsize">gsize</link> *length);</programlisting>
+<warning><para><literal>json_serialize_gobject</literal> has been deprecated since version 0.10 and should not be used in newly-written code. Use <link linkend="json-gobject-to-data"><function>json_gobject_to_data()</function></link> instead</para></warning>
+<para>
+Serializes a <link linkend="GObject"><type>GObject</type></link> into a JSON data stream. If <parameter>gobject</parameter> implements
+the <link linkend="JsonSerializableIface"><type>JsonSerializableIface</type></link> interface, it will be asked to serizalize all
+its properties; otherwise, the default implementation will be use to
+translate the compatible types into JSON native types.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>gobject</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="GObject"><type>GObject</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>length</parameter>&#160;:</term>
+<listitem><simpara> return value for the length of the buffer, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>. <acronym>out</acronym>. </simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a JSON data stream representing the passed <link linkend="GObject"><type>GObject</type></link>
+
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff -Nru json-glib-0.7.6/doc/reference/xml/json-node.xml json-glib-0.10.2/doc/reference/xml/json-node.xml
--- json-glib-0.7.6/doc/reference/xml/json-node.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-node.xml	2010-02-26 14:05:46.000000000 +0000
@@ -21,8 +21,13 @@
 
 <synopsis>
 enum                <link linkend="JsonNodeType">JsonNodeType</link>;
-#define             <link linkend="JSON-NODE-TYPE--CAPS">JSON_NODE_TYPE</link>                      (node)
                     <link linkend="JsonNode">JsonNode</link>;
+#define             <link linkend="JSON-NODE-TYPE--CAPS">JSON_NODE_TYPE</link>                      (node)
+#define             <link linkend="JSON-NODE-HOLDS--CAPS">JSON_NODE_HOLDS</link>                     (node,t)
+#define             <link linkend="JSON-NODE-HOLDS-VALUE--CAPS">JSON_NODE_HOLDS_VALUE</link>               (node)
+#define             <link linkend="JSON-NODE-HOLDS-OBJECT--CAPS">JSON_NODE_HOLDS_OBJECT</link>              (node)
+#define             <link linkend="JSON-NODE-HOLDS-ARRAY--CAPS">JSON_NODE_HOLDS_ARRAY</link>               (node)
+#define             <link linkend="JSON-NODE-HOLDS-NULL--CAPS">JSON_NODE_HOLDS_NULL</link>                (node)
 <link linkend="JsonNode">JsonNode</link> *          <link linkend="json-node-new">json_node_new</link>                       (<link linkend="JsonNodeType">JsonNodeType</link> type);
 <link linkend="JsonNode">JsonNode</link> *          <link linkend="json-node-copy">json_node_copy</link>                      (<link linkend="JsonNode">JsonNode</link> *node);
 <link linkend="void">void</link>                <link linkend="json-node-free">json_node_free</link>                      (<link linkend="JsonNode">JsonNode</link> *node);
@@ -59,6 +64,8 @@
 const <link linkend="gchar">gchar</link> *       <link linkend="json-node-get-string">json_node_get_string</link>                (<link linkend="JsonNode">JsonNode</link> *node);
 <link linkend="gchar">gchar</link> *             <link linkend="json-node-dup-string">json_node_dup_string</link>                (<link linkend="JsonNode">JsonNode</link> *node);
 
+<link linkend="void">void</link>                <link linkend="json-node-set-parent">json_node_set_parent</link>                (<link linkend="JsonNode">JsonNode</link> *node,
+                                                         <link linkend="JsonNode">JsonNode</link> *parent);
 <link linkend="JsonNode">JsonNode</link> *          <link linkend="json-node-get-parent">json_node_get_parent</link>                (<link linkend="JsonNode">JsonNode</link> *node);
 const <link linkend="gchar">gchar</link> *       <link linkend="json-node-type-name">json_node_type_name</link>                 (<link linkend="JsonNode">JsonNode</link> *node);
 <link linkend="GType">GType</link>               <link linkend="json-node-get-value-type">json_node_get_value_type</link>            (<link linkend="JsonNode">JsonNode</link> *node);
@@ -100,7 +107,7 @@
 <title role="details.title">Details</title>
 <refsect2 id="JsonNodeType" role="enum">
 <title>enum JsonNodeType</title>
-<indexterm zone="JsonNodeType"><primary sortas="JsonNodeType">JsonNodeType</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="JsonNodeType"><primary sortas="NodeType">JsonNodeType</primary></indexterm><programlisting>typedef enum {
   JSON_NODE_OBJECT,
   JSON_NODE_ARRAY,
   JSON_NODE_VALUE,
@@ -132,9 +139,19 @@
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
+<refsect2 id="JsonNode" role="struct">
+<title>JsonNode</title>
+<indexterm zone="JsonNode"><primary sortas="Node">JsonNode</primary></indexterm><programlisting>typedef struct _JsonNode JsonNode;</programlisting>
+<para>
+A generic container of JSON data types. The contents of the <link linkend="JsonNode"><type>JsonNode</type></link>
+structure are private and should only be accessed via the provided
+functions and never directly.</para>
+<para>
+</para><variablelist role="struct">
+</variablelist></refsect2>
 <refsect2 id="JSON-NODE-TYPE--CAPS" role="macro">
 <title>JSON_NODE_TYPE()</title>
-<indexterm zone="JSON-NODE-TYPE--CAPS"><primary sortas="JSON_NODE_TYPE">JSON_NODE_TYPE</primary></indexterm><programlisting>#define JSON_NODE_TYPE(node)    (json_node_get_node_type ((node)))
+<indexterm zone="JSON-NODE-TYPE--CAPS"><primary sortas="NODE_TYPE">JSON_NODE_TYPE</primary></indexterm><programlisting>#define JSON_NODE_TYPE(node)    (json_node_get_node_type ((node)))
 </programlisting>
 <para>
 Evaluates to the <link linkend="JsonNodeType"><type>JsonNodeType</type></link> contained by <parameter>node</parameter></para>
@@ -144,19 +161,72 @@
 <listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="JsonNode" role="struct">
-<title>JsonNode</title>
-<indexterm zone="JsonNode"><primary sortas="JsonNode">JsonNode</primary></indexterm><programlisting>typedef struct _JsonNode JsonNode;</programlisting>
+<refsect2 id="JSON-NODE-HOLDS--CAPS" role="macro" condition="since:0.10">
+<title>JSON_NODE_HOLDS()</title>
+<indexterm zone="JSON-NODE-HOLDS--CAPS" role="0.10"><primary sortas="NODE_HOLDS">JSON_NODE_HOLDS</primary></indexterm><programlisting>#define JSON_NODE_HOLDS(node,t)         (json_node_get_node_type ((node)) == (t))
+</programlisting>
 <para>
-A generic container of JSON data types. The contents of the <link linkend="JsonNode"><type>JsonNode</type></link>
-structure are private and should only be accessed via the provided
-functions and never directly.</para>
+Evaluates to <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the <parameter>node</parameter> holds type <parameter>t</parameter></para>
 <para>
-</para><variablelist role="struct">
-</variablelist></refsect2>
+</para><variablelist role="params">
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>t</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNodeType"><type>JsonNodeType</type></link>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="JSON-NODE-HOLDS-VALUE--CAPS" role="macro" condition="since:0.10">
+<title>JSON_NODE_HOLDS_VALUE()</title>
+<indexterm zone="JSON-NODE-HOLDS-VALUE--CAPS" role="0.10"><primary sortas="NODE_HOLDS_VALUE">JSON_NODE_HOLDS_VALUE</primary></indexterm><programlisting>#define JSON_NODE_HOLDS_VALUE(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_VALUE))
+</programlisting>
+<para>
+Evaluates to <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if <parameter>node</parameter> holds a <link linkend="JSON-NODE-VALUE--CAPS"><literal>JSON_NODE_VALUE</literal></link></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="JSON-NODE-HOLDS-OBJECT--CAPS" role="macro" condition="since:0.10">
+<title>JSON_NODE_HOLDS_OBJECT()</title>
+<indexterm zone="JSON-NODE-HOLDS-OBJECT--CAPS" role="0.10"><primary sortas="NODE_HOLDS_OBJECT">JSON_NODE_HOLDS_OBJECT</primary></indexterm><programlisting>#define JSON_NODE_HOLDS_OBJECT(node)    (JSON_NODE_HOLDS ((node), JSON_NODE_OBJECT))
+</programlisting>
+<para>
+Evaluates to <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if <parameter>node</parameter> holds a <link linkend="JSON-NODE-OBJECT--CAPS"><literal>JSON_NODE_OBJECT</literal></link></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="JSON-NODE-HOLDS-ARRAY--CAPS" role="macro" condition="since:0.10">
+<title>JSON_NODE_HOLDS_ARRAY()</title>
+<indexterm zone="JSON-NODE-HOLDS-ARRAY--CAPS" role="0.10"><primary sortas="NODE_HOLDS_ARRAY">JSON_NODE_HOLDS_ARRAY</primary></indexterm><programlisting>#define JSON_NODE_HOLDS_ARRAY(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_ARRAY))
+</programlisting>
+<para>
+Evaluates to <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if <parameter>node</parameter> holds a <link linkend="JSON-NODE-ARRAY--CAPS"><literal>JSON_NODE_ARRAY</literal></link></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="JSON-NODE-HOLDS-NULL--CAPS" role="macro" condition="since:0.10">
+<title>JSON_NODE_HOLDS_NULL()</title>
+<indexterm zone="JSON-NODE-HOLDS-NULL--CAPS" role="0.10"><primary sortas="NODE_HOLDS_NULL">JSON_NODE_HOLDS_NULL</primary></indexterm><programlisting>#define JSON_NODE_HOLDS_NULL(node)      (JSON_NODE_HOLDS ((node), JSON_NODE_NULL))
+</programlisting>
+<para>
+Evaluates to <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if <parameter>node</parameter> holds a <link linkend="JSON-NODE-NULL--CAPS"><literal>JSON_NODE_NULL</literal></link></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
 <refsect2 id="json-node-new" role="function">
 <title>json_node_new ()</title>
-<indexterm zone="json-node-new"><primary sortas="json_node_new">json_node_new</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_node_new                       (<link linkend="JsonNodeType">JsonNodeType</link> type);</programlisting>
+<indexterm zone="json-node-new"><primary sortas="node_new">json_node_new</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_node_new                       (<link linkend="JsonNodeType">JsonNodeType</link> type);</programlisting>
 <para>
 Creates a new <link linkend="JsonNode"><type>JsonNode</type></link> of <parameter>type</parameter>.</para>
 <para>
@@ -169,7 +239,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-copy" role="function">
 <title>json_node_copy ()</title>
-<indexterm zone="json-node-copy"><primary sortas="json_node_copy">json_node_copy</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_node_copy                      (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-copy"><primary sortas="node_copy">json_node_copy</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_node_copy                      (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Copies <parameter>node</parameter>. If the node contains complex data types then the reference
 count of the objects is increased.</para>
@@ -178,12 +248,11 @@
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the copied <link linkend="JsonNode"><type>JsonNode</type></link>
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the copied <link linkend="JsonNode"><type>JsonNode</type></link>. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-node-free" role="function">
 <title>json_node_free ()</title>
-<indexterm zone="json-node-free"><primary sortas="json_node_free">json_node_free</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_free                      (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-free"><primary sortas="node_free">json_node_free</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_free                      (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Frees the resources allocated by <parameter>node</parameter>.</para>
 <para>
@@ -194,7 +263,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-set-array" role="function">
 <title>json_node_set_array ()</title>
-<indexterm zone="json-node-set-array"><primary sortas="json_node_set_array">json_node_set_array</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_array                 (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-set-array"><primary sortas="node_set_array">json_node_set_array</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_array                 (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="JsonArray">JsonArray</link> *array);</programlisting>
 <para>
 Sets <parameter>array</parameter> inside <parameter>node</parameter> and increases the <link linkend="JsonArray"><type>JsonArray</type></link> reference count</para>
@@ -209,7 +278,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-take-array" role="function">
 <title>json_node_take_array ()</title>
-<indexterm zone="json-node-take-array"><primary sortas="json_node_take_array">json_node_take_array</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_take_array                (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-take-array"><primary sortas="node_take_array">json_node_take_array</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_take_array                (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="JsonArray">JsonArray</link> *array);</programlisting>
 <para>
 Sets <parameter>array</parameter> into <parameter>node</parameter> without increasing the <link linkend="JsonArray"><type>JsonArray</type></link> reference count.</para>
@@ -224,7 +293,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-array" role="function">
 <title>json_node_get_array ()</title>
-<indexterm zone="json-node-get-array"><primary sortas="json_node_get_array">json_node_get_array</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_node_get_array                 (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-array"><primary sortas="node_get_array">json_node_get_array</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_node_get_array                 (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Retrieves the <link linkend="JsonArray"><type>JsonArray</type></link> stored inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
 <para>
@@ -232,12 +301,11 @@
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <link linkend="JsonArray"><type>JsonArray</type></link>
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <link linkend="JsonArray"><type>JsonArray</type></link>. <acronym>transfer</acronym> none. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-node-dup-array" role="function">
 <title>json_node_dup_array ()</title>
-<indexterm zone="json-node-dup-array"><primary sortas="json_node_dup_array">json_node_dup_array</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_node_dup_array                 (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-dup-array"><primary sortas="node_dup_array">json_node_dup_array</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_node_dup_array                 (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Retrieves the <link linkend="JsonArray"><type>JsonArray</type></link> stored inside a <link linkend="JsonNode"><type>JsonNode</type></link> and returns it
 with its reference count increased by one.</para>
@@ -246,12 +314,11 @@
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <link linkend="JsonArray"><type>JsonArray</type></link> with its reference count increased.
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>transfer full. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-node-set-object" role="function">
 <title>json_node_set_object ()</title>
-<indexterm zone="json-node-set-object"><primary sortas="json_node_set_object">json_node_set_object</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_object                (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-set-object"><primary sortas="node_set_object">json_node_set_object</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_object                (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="JsonObject">JsonObject</link> *object);</programlisting>
 <para>
 Sets <parameter>objects</parameter> inside <parameter>node</parameter>. The reference count of <parameter>object</parameter> is increased.</para>
@@ -266,7 +333,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-take-object" role="function">
 <title>json_node_take_object ()</title>
-<indexterm zone="json-node-take-object"><primary sortas="json_node_take_object">json_node_take_object</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_take_object               (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-take-object"><primary sortas="node_take_object">json_node_take_object</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_take_object               (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="JsonObject">JsonObject</link> *object);</programlisting>
 <para>
 Sets <parameter>object</parameter> inside <parameter>node</parameter>. The reference count of <parameter>object</parameter> is not increased.</para>
@@ -281,7 +348,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-object" role="function">
 <title>json_node_get_object ()</title>
-<indexterm zone="json-node-get-object"><primary sortas="json_node_get_object">json_node_get_object</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_node_get_object                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-object"><primary sortas="node_get_object">json_node_get_object</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_node_get_object                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Retrieves the <link linkend="JsonObject"><type>JsonObject</type></link> stored inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
 <para>
@@ -289,12 +356,11 @@
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <link linkend="JsonObject"><type>JsonObject</type></link>
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <link linkend="JsonObject"><type>JsonObject</type></link>. <acronym>transfer</acronym> none. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-node-dup-object" role="function">
 <title>json_node_dup_object ()</title>
-<indexterm zone="json-node-dup-object"><primary sortas="json_node_dup_object">json_node_dup_object</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_node_dup_object                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-dup-object"><primary sortas="node_dup_object">json_node_dup_object</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_node_dup_object                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Retrieves the <link linkend="JsonObject"><type>JsonObject</type></link> inside <parameter>node</parameter>. The reference count of
 the returned object is increased.</para>
@@ -303,12 +369,11 @@
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <link linkend="JsonObject"><type>JsonObject</type></link>
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <link linkend="JsonObject"><type>JsonObject</type></link>. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-node-set-value" role="function">
 <title>json_node_set_value ()</title>
-<indexterm zone="json-node-set-value"><primary sortas="json_node_set_value">json_node_set_value</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_value                 (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-set-value"><primary sortas="node_set_value">json_node_set_value</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_value                 (<link linkend="JsonNode">JsonNode</link> *node,
                                                          const <link linkend="GValue">GValue</link> *value);</programlisting>
 <para>
 Sets <parameter>value</parameter> inside <parameter>node</parameter>. The passed <link linkend="GValue"><type>GValue</type></link> is copied into the <link linkend="JsonNode"><type>JsonNode</type></link></para>
@@ -323,7 +388,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-value" role="function">
 <title>json_node_get_value ()</title>
-<indexterm zone="json-node-get-value"><primary sortas="json_node_get_value">json_node_get_value</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_get_value                 (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-get-value"><primary sortas="node_get_value">json_node_get_value</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_get_value                 (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="GValue">GValue</link> *value);</programlisting>
 <para>
 Retrieves a value from a <link linkend="JsonNode"><type>JsonNode</type></link> and copies into <parameter>value</parameter>. When done
@@ -339,7 +404,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-set-boolean" role="function">
 <title>json_node_set_boolean ()</title>
-<indexterm zone="json-node-set-boolean"><primary sortas="json_node_set_boolean">json_node_set_boolean</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_boolean               (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-set-boolean"><primary sortas="node_set_boolean">json_node_set_boolean</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_boolean               (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="gboolean">gboolean</link> value);</programlisting>
 <para>
 Sets <parameter>value</parameter> as the boolean content of the <parameter>node</parameter>, replacing any existing
@@ -355,7 +420,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-boolean" role="function">
 <title>json_node_get_boolean ()</title>
-<indexterm zone="json-node-get-boolean"><primary sortas="json_node_get_boolean">json_node_get_boolean</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_node_get_boolean               (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-boolean"><primary sortas="node_get_boolean">json_node_get_boolean</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_node_get_boolean               (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Gets the boolean value stored inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
 <para>
@@ -368,7 +433,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-set-double" role="function">
 <title>json_node_set_double ()</title>
-<indexterm zone="json-node-set-double"><primary sortas="json_node_set_double">json_node_set_double</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_double                (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-set-double"><primary sortas="node_set_double">json_node_set_double</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_double                (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="gdouble">gdouble</link> value);</programlisting>
 <para>
 Sets <parameter>value</parameter> as the double content of the <parameter>node</parameter>, replacing any existing
@@ -384,7 +449,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-double" role="function">
 <title>json_node_get_double ()</title>
-<indexterm zone="json-node-get-double"><primary sortas="json_node_get_double">json_node_get_double</primary></indexterm><programlisting><link linkend="gdouble">gdouble</link>             json_node_get_double                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-double"><primary sortas="node_get_double">json_node_get_double</primary></indexterm><programlisting><link linkend="gdouble">gdouble</link>             json_node_get_double                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Gets the double value stored inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
 <para>
@@ -397,7 +462,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-set-int" role="function">
 <title>json_node_set_int ()</title>
-<indexterm zone="json-node-set-int"><primary sortas="json_node_set_int">json_node_set_int</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_int                   (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-set-int"><primary sortas="node_set_int">json_node_set_int</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_int                   (<link linkend="JsonNode">JsonNode</link> *node,
                                                          <link linkend="gint64">gint64</link> value);</programlisting>
 <para>
 Sets <parameter>value</parameter> as the integer content of the <parameter>node</parameter>, replacing any existing
@@ -413,7 +478,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-int" role="function">
 <title>json_node_get_int ()</title>
-<indexterm zone="json-node-get-int"><primary sortas="json_node_get_int">json_node_get_int</primary></indexterm><programlisting><link linkend="gint64">gint64</link>              json_node_get_int                   (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-int"><primary sortas="node_get_int">json_node_get_int</primary></indexterm><programlisting><link linkend="gint64">gint64</link>              json_node_get_int                   (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Gets the integer value stored inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
 <para>
@@ -426,7 +491,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-set-string" role="function">
 <title>json_node_set_string ()</title>
-<indexterm zone="json-node-set-string"><primary sortas="json_node_set_string">json_node_set_string</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_string                (<link linkend="JsonNode">JsonNode</link> *node,
+<indexterm zone="json-node-set-string"><primary sortas="node_set_string">json_node_set_string</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_string                (<link linkend="JsonNode">JsonNode</link> *node,
                                                          const <link linkend="gchar">gchar</link> *value);</programlisting>
 <para>
 Sets <parameter>value</parameter> as the string content of the <parameter>node</parameter>, replacing any existing
@@ -442,7 +507,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-string" role="function">
 <title>json_node_get_string ()</title>
-<indexterm zone="json-node-get-string"><primary sortas="json_node_get_string">json_node_get_string</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_node_get_string                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-string"><primary sortas="node_get_string">json_node_get_string</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_node_get_string                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Gets the string value stored inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
 <para>
@@ -455,7 +520,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-dup-string" role="function">
 <title>json_node_dup_string ()</title>
-<indexterm zone="json-node-dup-string"><primary sortas="json_node_dup_string">json_node_dup_string</primary></indexterm><programlisting><link linkend="gchar">gchar</link> *             json_node_dup_string                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-dup-string"><primary sortas="node_dup_string">json_node_dup_string</primary></indexterm><programlisting><link linkend="gchar">gchar</link> *             json_node_dup_string                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Gets a copy of the string value stored inside a <link linkend="JsonNode"><type>JsonNode</type></link></para>
 <para>
@@ -463,13 +528,26 @@
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> of type <link linkend="JSON-NODE-VALUE--CAPS"><literal>JSON_NODE_VALUE</literal></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a newly allocated string containing a copy of
-  the <link linkend="JsonNode"><type>JsonNode</type></link> contents
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>transfer full. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="json-node-set-parent" role="function" condition="since:0.8">
+<title>json_node_set_parent ()</title>
+<indexterm zone="json-node-set-parent" role="0.8"><primary sortas="node_set_parent">json_node_set_parent</primary></indexterm><programlisting><link linkend="void">void</link>                json_node_set_parent                (<link linkend="JsonNode">JsonNode</link> *node,
+                                                         <link linkend="JsonNode">JsonNode</link> *parent);</programlisting>
+<para>
+Sets the parent <link linkend="JsonNode"><type>JsonNode</type></link> of <parameter>node</parameter></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
+<listitem><simpara> the parent <link linkend="JsonNode"><type>JsonNode</type></link> of <parameter>node</parameter>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-node-get-parent" role="function">
 <title>json_node_get_parent ()</title>
-<indexterm zone="json-node-get-parent"><primary sortas="json_node_get_parent">json_node_get_parent</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_node_get_parent                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-parent"><primary sortas="node_get_parent">json_node_get_parent</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_node_get_parent                (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Retrieves the parent <link linkend="JsonNode"><type>JsonNode</type></link> of <parameter>node</parameter>.</para>
 <para>
@@ -482,7 +560,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-type-name" role="function">
 <title>json_node_type_name ()</title>
-<indexterm zone="json-node-type-name"><primary sortas="json_node_type_name">json_node_type_name</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_node_type_name                 (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-type-name"><primary sortas="node_type_name">json_node_type_name</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_node_type_name                 (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Retrieves the user readable name of the data type contained by <parameter>node</parameter>.</para>
 <para>
@@ -496,7 +574,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-node-get-value-type" role="function" condition="since:0.4">
 <title>json_node_get_value_type ()</title>
-<indexterm zone="json-node-get-value-type" role="0.4"><primary sortas="json_node_get_value_type">json_node_get_value_type</primary></indexterm><programlisting><link linkend="GType">GType</link>               json_node_get_value_type            (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-value-type" role="0.4"><primary sortas="node_get_value_type">json_node_get_value_type</primary></indexterm><programlisting><link linkend="GType">GType</link>               json_node_get_value_type            (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Returns the <link linkend="GType"><type>GType</type></link> of the payload of the node.</para>
 <para>
@@ -510,7 +588,7 @@
 </variablelist><para role="since">Since 0.4</para></refsect2>
 <refsect2 id="json-node-get-node-type" role="function" condition="since:0.8">
 <title>json_node_get_node_type ()</title>
-<indexterm zone="json-node-get-node-type" role="0.8"><primary sortas="json_node_get_node_type">json_node_get_node_type</primary></indexterm><programlisting><link linkend="JsonNodeType">JsonNodeType</link>        json_node_get_node_type             (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-get-node-type" role="0.8"><primary sortas="node_get_node_type">json_node_get_node_type</primary></indexterm><programlisting><link linkend="JsonNodeType">JsonNodeType</link>        json_node_get_node_type             (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Retrieves the <link linkend="JsonNodeType"><type>JsonNodeType</type></link> of <parameter>node</parameter></para>
 <para>
@@ -524,7 +602,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-node-is-null" role="function" condition="since:0.8">
 <title>json_node_is_null ()</title>
-<indexterm zone="json-node-is-null" role="0.8"><primary sortas="json_node_is_null">json_node_is_null</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_node_is_null                   (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
+<indexterm zone="json-node-is-null" role="0.8"><primary sortas="node_is_null">json_node_is_null</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_node_is_null                   (<link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
 Checks whether <parameter>node</parameter> is a <link linkend="JSON-NODE-NULL--CAPS"><literal>JSON_NODE_NULL</literal></link>
 </para>
diff -Nru json-glib-0.7.6/doc/reference/xml/json-object.xml json-glib-0.10.2/doc/reference/xml/json-object.xml
--- json-glib-0.7.6/doc/reference/xml/json-object.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-object.xml	2010-02-26 14:05:46.000000000 +0000
@@ -100,11 +100,7 @@
 <para>
 <link linkend="JsonArray"><type>JsonArray</type></link> is the representation of the object type inside JSON. It contains
 <link linkend="JsonNode"><type>JsonNode</type></link><!-- -->s, which may contain fundamental types, arrays or other
-objects. Each member of an object is accessed using its name. Please note
-that the member names are normalized internally before being used; every
-delimiter matching the <link linkend="G-STR-DELIMITER--CAPS"><literal>G_STR_DELIMITER</literal></link> macro will be transformed into an
-underscore, so for instance "member-name" and "member_name" are equivalent
-for a <link linkend="JsonObject"><type>JsonObject</type></link>.
+objects. Each member of an object is accessed using its name.
 </para>
 <para>
 Since objects can be expensive, they are reference counted. You can control
@@ -124,7 +120,7 @@
 <title role="details.title">Details</title>
 <refsect2 id="JsonObject" role="struct">
 <title>JsonObject</title>
-<indexterm zone="JsonObject"><primary sortas="JsonObject">JsonObject</primary></indexterm><programlisting>typedef struct _JsonObject JsonObject;</programlisting>
+<indexterm zone="JsonObject"><primary sortas="Object">JsonObject</primary></indexterm><programlisting>typedef struct _JsonObject JsonObject;</programlisting>
 <para>
 A JSON object type. The contents of the <link linkend="JsonObject"><type>JsonObject</type></link> structure are private
 and should only be accessed by the provided API</para>
@@ -132,7 +128,7 @@
 </para></refsect2>
 <refsect2 id="json-object-new" role="function">
 <title>json_object_new ()</title>
-<indexterm zone="json-object-new"><primary sortas="json_object_new">json_object_new</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_object_new                     (void);</programlisting>
+<indexterm zone="json-object-new"><primary sortas="object_new">json_object_new</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_object_new                     (void);</programlisting>
 <para>
 Creates a new <link linkend="JsonObject"><type>JsonObject</type></link>, an JSON object type representation.</para>
 <para>
@@ -142,7 +138,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-object-ref" role="function">
 <title>json_object_ref ()</title>
-<indexterm zone="json-object-ref"><primary sortas="json_object_ref">json_object_ref</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_object_ref                     (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
+<indexterm zone="json-object-ref"><primary sortas="object_ref">json_object_ref</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_object_ref                     (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
 <para>
 Increase by one the reference count of a <link linkend="JsonObject"><type>JsonObject</type></link>.</para>
 <para>
@@ -156,7 +152,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-object-unref" role="function">
 <title>json_object_unref ()</title>
-<indexterm zone="json-object-unref"><primary sortas="json_object_unref">json_object_unref</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_unref                   (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
+<indexterm zone="json-object-unref"><primary sortas="object_unref">json_object_unref</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_unref                   (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
 <para>
 Decreases by one the reference count of a <link linkend="JsonObject"><type>JsonObject</type></link>. If the
 reference count reaches zero, the object is destroyed and all
@@ -169,7 +165,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-object-add-member" role="function" condition="deprecated:0.8: Use json_object_set_member() instead">
 <title>json_object_add_member ()</title>
-<indexterm zone="json-object-add-member" role="deprecated"><primary sortas="json_object_add_member">json_object_add_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_add_member              (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-add-member" role="deprecated"><primary sortas="object_add_member">json_object_add_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_add_member              (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <warning><para><literal>json_object_add_member</literal> has been deprecated since version 0.8 and should not be used in newly-written code. Use <link linkend="json-object-set-member"><function>json_object_set_member()</function></link> instead</para></warning>
@@ -194,7 +190,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-object-set-member" role="function" condition="since:0.8">
 <title>json_object_set_member ()</title>
-<indexterm zone="json-object-set-member" role="0.8"><primary sortas="json_object_set_member">json_object_set_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_member              (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-member" role="0.8"><primary sortas="object_set_member">json_object_set_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_member              (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="JsonNode">JsonNode</link> *node);</programlisting>
 <para>
@@ -218,7 +214,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-has-member" role="function">
 <title>json_object_has_member ()</title>
-<indexterm zone="json-object-has-member"><primary sortas="json_object_has_member">json_object_has_member</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_object_has_member              (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-has-member"><primary sortas="object_has_member">json_object_has_member</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_object_has_member              (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Checks whether <parameter>object</parameter> has a member named <parameter>member_name</parameter>.</para>
@@ -235,7 +231,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-object-get-member" role="function">
 <title>json_object_get_member ()</title>
-<indexterm zone="json-object-get-member"><primary sortas="json_object_get_member">json_object_get_member</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_object_get_member              (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-member"><primary sortas="object_get_member">json_object_get_member</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_object_get_member              (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Retrieves the <link linkend="JsonNode"><type>JsonNode</type></link> containing the value of <parameter>member_name</parameter> inside
@@ -254,7 +250,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-object-dup-member" role="function" condition="since:0.6">
 <title>json_object_dup_member ()</title>
-<indexterm zone="json-object-dup-member" role="0.6"><primary sortas="json_object_dup_member">json_object_dup_member</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_object_dup_member              (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-dup-member" role="0.6"><primary sortas="object_dup_member">json_object_dup_member</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_object_dup_member              (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Retrieves a copy of the <link linkend="JsonNode"><type>JsonNode</type></link> containing the value of <parameter>member_name</parameter>
@@ -267,14 +263,14 @@
 <varlistentry><term><parameter>member_name</parameter>&#160;:</term>
 <listitem><simpara> the name of the JSON object member to access
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a copy of the node for the requested object member
-  or <link linkend="NULL--CAPS"><literal>NULL</literal></link>. Use <link linkend="json-node-free"><function>json_node_free()</function></link> when done.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> (transfer full) a copy of the node for the requested
+  object member or <link linkend="NULL--CAPS"><literal>NULL</literal></link>. Use <link linkend="json-node-free"><function>json_node_free()</function></link> when done.
 
 </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.6</para></refsect2>
 <refsect2 id="json-object-get-members" role="function">
 <title>json_object_get_members ()</title>
-<indexterm zone="json-object-get-members"><primary sortas="json_object_get_members">json_object_get_members</primary></indexterm><programlisting><link linkend="GList">GList</link> *             json_object_get_members             (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
+<indexterm zone="json-object-get-members"><primary sortas="object_get_members">json_object_get_members</primary></indexterm><programlisting><link linkend="GList">GList</link> *             json_object_get_members             (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
 <para>
 Retrieves all the names of the members of a <link linkend="JsonObject"><type>JsonObject</type></link>. You can
 obtain the value for each member using <link linkend="json-object-get-member"><function>json_object_get_member()</function></link>.</para>
@@ -283,15 +279,11 @@
 <varlistentry><term><parameter>object</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonObject"><type>JsonObject</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="GList"><type>GList</type></link> of member names. The content of the list
-  is owned by the <link linkend="JsonObject"><type>JsonObject</type></link> and should never be modified or
-  freed. When you have finished using the returned list, use
-  <link linkend="g-list-free"><function>g_list_free()</function></link> to free the resources it has allocated.
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>element-type utf8) (transfer container. <acronym>element-type</acronym> utf8. <acronym>transfer</acronym> container. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-object-get-values" role="function">
 <title>json_object_get_values ()</title>
-<indexterm zone="json-object-get-values"><primary sortas="json_object_get_values">json_object_get_values</primary></indexterm><programlisting><link linkend="GList">GList</link> *             json_object_get_values              (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
+<indexterm zone="json-object-get-values"><primary sortas="object_get_values">json_object_get_values</primary></indexterm><programlisting><link linkend="GList">GList</link> *             json_object_get_values              (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
 <para>
 Retrieves all the values of the members of a <link linkend="JsonObject"><type>JsonObject</type></link>.</para>
 <para>
@@ -299,15 +291,11 @@
 <varlistentry><term><parameter>object</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonObject"><type>JsonObject</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="GList"><type>GList</type></link> of <link linkend="JsonNode"><type>JsonNode</type></link><!-- -->s. The content of the
-  list is owned by the <link linkend="JsonObject"><type>JsonObject</type></link> and should never be modified
-  or freed. When you have finished using the returned list, use
-  <link linkend="g-list-free"><function>g_list_free()</function></link> to free the resources it has allocated.
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>element-type JsonNode) (transfer container. <acronym>element-type</acronym> JsonNode. <acronym>transfer</acronym> container. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-object-get-size" role="function">
 <title>json_object_get_size ()</title>
-<indexterm zone="json-object-get-size"><primary sortas="json_object_get_size">json_object_get_size</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_object_get_size                (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
+<indexterm zone="json-object-get-size"><primary sortas="object_get_size">json_object_get_size</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_object_get_size                (<link linkend="JsonObject">JsonObject</link> *object);</programlisting>
 <para>
 Retrieves the number of members of a <link linkend="JsonObject"><type>JsonObject</type></link>.</para>
 <para>
@@ -320,7 +308,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-object-remove-member" role="function">
 <title>json_object_remove_member ()</title>
-<indexterm zone="json-object-remove-member"><primary sortas="json_object_remove_member">json_object_remove_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_remove_member           (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-remove-member"><primary sortas="object_remove_member">json_object_remove_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_remove_member           (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Removes <parameter>member_name</parameter> from <parameter>object</parameter>, freeing its allocated resources.</para>
@@ -335,7 +323,7 @@
 </variablelist></refsect2>
 <refsect2 id="JsonObjectForeach" role="function" condition="since:0.8">
 <title>JsonObjectForeach ()</title>
-<indexterm zone="JsonObjectForeach" role="0.8"><primary sortas="JsonObjectForeach">JsonObjectForeach</primary></indexterm><programlisting><link linkend="void">void</link>                (*JsonObjectForeach)                (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="JsonObjectForeach" role="0.8"><primary sortas="ObjectForeach">JsonObjectForeach</primary></indexterm><programlisting><link linkend="void">void</link>                (*JsonObjectForeach)                (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="JsonNode">JsonNode</link> *member_node,
                                                          <link linkend="gpointer">gpointer</link> user_data);</programlisting>
@@ -360,7 +348,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-foreach-member" role="function" condition="since:0.8">
 <title>json_object_foreach_member ()</title>
-<indexterm zone="json-object-foreach-member" role="0.8"><primary sortas="json_object_foreach_member">json_object_foreach_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_foreach_member          (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-foreach-member" role="0.8"><primary sortas="object_foreach_member">json_object_foreach_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_foreach_member          (<link linkend="JsonObject">JsonObject</link> *object,
                                                          <link linkend="JsonObjectForeach">JsonObjectForeach</link> func,
                                                          <link linkend="gpointer">gpointer</link> data);</programlisting>
 <para>
@@ -385,7 +373,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-set-array-member" role="function" condition="since:0.8">
 <title>json_object_set_array_member ()</title>
-<indexterm zone="json-object-set-array-member" role="0.8"><primary sortas="json_object_set_array_member">json_object_set_array_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_array_member        (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-array-member" role="0.8"><primary sortas="object_set_array_member">json_object_set_array_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_array_member        (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="JsonArray">JsonArray</link> *value);</programlisting>
 <para>
@@ -411,7 +399,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-get-array-member" role="function" condition="since:0.8">
 <title>json_object_get_array_member ()</title>
-<indexterm zone="json-object-get-array-member" role="0.8"><primary sortas="json_object_get_array_member">json_object_get_array_member</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_object_get_array_member        (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-array-member" role="0.8"><primary sortas="object_get_array_member">json_object_get_array_member</primary></indexterm><programlisting><link linkend="JsonArray">JsonArray</link> *         json_object_get_array_member        (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function that retrieves the array
@@ -427,13 +415,11 @@
 <varlistentry><term><parameter>member_name</parameter>&#160;:</term>
 <listitem><simpara> the name of the member
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the array inside the object's member
-
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the array inside the object's member. <acronym>transfer</acronym> none. </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-set-boolean-member" role="function" condition="since:0.8">
 <title>json_object_set_boolean_member ()</title>
-<indexterm zone="json-object-set-boolean-member" role="0.8"><primary sortas="json_object_set_boolean_member">json_object_set_boolean_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_boolean_member      (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-boolean-member" role="0.8"><primary sortas="object_set_boolean_member">json_object_set_boolean_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_boolean_member      (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="gboolean">gboolean</link> value);</programlisting>
 <para>
@@ -456,7 +442,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-get-boolean-member" role="function" condition="since:0.8">
 <title>json_object_get_boolean_member ()</title>
-<indexterm zone="json-object-get-boolean-member" role="0.8"><primary sortas="json_object_get_boolean_member">json_object_get_boolean_member</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_object_get_boolean_member      (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-boolean-member" role="0.8"><primary sortas="object_get_boolean_member">json_object_get_boolean_member</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_object_get_boolean_member      (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function that retrieves the boolean value
@@ -478,7 +464,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-set-double-member" role="function" condition="since:0.8">
 <title>json_object_set_double_member ()</title>
-<indexterm zone="json-object-set-double-member" role="0.8"><primary sortas="json_object_set_double_member">json_object_set_double_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_double_member       (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-double-member" role="0.8"><primary sortas="object_set_double_member">json_object_set_double_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_double_member       (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="gdouble">gdouble</link> value);</programlisting>
 <para>
@@ -501,7 +487,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-get-double-member" role="function" condition="since:0.8">
 <title>json_object_get_double_member ()</title>
-<indexterm zone="json-object-get-double-member" role="0.8"><primary sortas="json_object_get_double_member">json_object_get_double_member</primary></indexterm><programlisting><link linkend="gdouble">gdouble</link>             json_object_get_double_member       (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-double-member" role="0.8"><primary sortas="object_get_double_member">json_object_get_double_member</primary></indexterm><programlisting><link linkend="gdouble">gdouble</link>             json_object_get_double_member       (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function that retrieves the floating point value
@@ -523,7 +509,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-set-int-member" role="function" condition="since:0.8">
 <title>json_object_set_int_member ()</title>
-<indexterm zone="json-object-set-int-member" role="0.8"><primary sortas="json_object_set_int_member">json_object_set_int_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_int_member          (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-int-member" role="0.8"><primary sortas="object_set_int_member">json_object_set_int_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_int_member          (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="gint64">gint64</link> value);</programlisting>
 <para>
@@ -546,7 +532,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-get-int-member" role="function" condition="since:0.8">
 <title>json_object_get_int_member ()</title>
-<indexterm zone="json-object-get-int-member" role="0.8"><primary sortas="json_object_get_int_member">json_object_get_int_member</primary></indexterm><programlisting><link linkend="gint64">gint64</link>              json_object_get_int_member          (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-int-member" role="0.8"><primary sortas="object_get_int_member">json_object_get_int_member</primary></indexterm><programlisting><link linkend="gint64">gint64</link>              json_object_get_int_member          (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function that retrieves the integer value
@@ -568,7 +554,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-set-null-member" role="function" condition="since:0.8">
 <title>json_object_set_null_member ()</title>
-<indexterm zone="json-object-set-null-member" role="0.8"><primary sortas="json_object_set_null_member">json_object_set_null_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_null_member         (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-null-member" role="0.8"><primary sortas="object_set_null_member">json_object_set_null_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_null_member         (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function for setting a null <parameter>value</parameter> of
@@ -587,7 +573,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-get-null-member" role="function" condition="since:0.8">
 <title>json_object_get_null_member ()</title>
-<indexterm zone="json-object-get-null-member" role="0.8"><primary sortas="json_object_get_null_member">json_object_get_null_member</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_object_get_null_member         (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-null-member" role="0.8"><primary sortas="object_get_null_member">json_object_get_null_member</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_object_get_null_member         (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function that checks whether the value
@@ -609,7 +595,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-set-object-member" role="function" condition="since:0.8">
 <title>json_object_set_object_member ()</title>
-<indexterm zone="json-object-set-object-member" role="0.8"><primary sortas="json_object_set_object_member">json_object_set_object_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_object_member       (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-object-member" role="0.8"><primary sortas="object_set_object_member">json_object_set_object_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_object_member       (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          <link linkend="JsonObject">JsonObject</link> *value);</programlisting>
 <para>
@@ -635,7 +621,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-get-object-member" role="function" condition="since:0.8">
 <title>json_object_get_object_member ()</title>
-<indexterm zone="json-object-get-object-member" role="0.8"><primary sortas="json_object_get_object_member">json_object_get_object_member</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_object_get_object_member       (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-object-member" role="0.8"><primary sortas="object_get_object_member">json_object_get_object_member</primary></indexterm><programlisting><link linkend="JsonObject">JsonObject</link> *        json_object_get_object_member       (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function that retrieves the object
@@ -651,13 +637,11 @@
 <varlistentry><term><parameter>member_name</parameter>&#160;:</term>
 <listitem><simpara> the name of the member
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the object inside the object's member
-
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the object inside the object's member. <acronym>transfer</acronym> none. </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-set-string-member" role="function" condition="since:0.8">
 <title>json_object_set_string_member ()</title>
-<indexterm zone="json-object-set-string-member" role="0.8"><primary sortas="json_object_set_string_member">json_object_set_string_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_string_member       (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-set-string-member" role="0.8"><primary sortas="object_set_string_member">json_object_set_string_member</primary></indexterm><programlisting><link linkend="void">void</link>                json_object_set_string_member       (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name,
                                                          const <link linkend="gchar">gchar</link> *value);</programlisting>
 <para>
@@ -680,7 +664,7 @@
 </variablelist><para role="since">Since 0.8</para></refsect2>
 <refsect2 id="json-object-get-string-member" role="function" condition="since:0.8">
 <title>json_object_get_string_member ()</title>
-<indexterm zone="json-object-get-string-member" role="0.8"><primary sortas="json_object_get_string_member">json_object_get_string_member</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_object_get_string_member       (<link linkend="JsonObject">JsonObject</link> *object,
+<indexterm zone="json-object-get-string-member" role="0.8"><primary sortas="object_get_string_member">json_object_get_string_member</primary></indexterm><programlisting>const <link linkend="gchar">gchar</link> *       json_object_get_string_member       (<link linkend="JsonObject">JsonObject</link> *object,
                                                          const <link linkend="gchar">gchar</link> *member_name);</programlisting>
 <para>
 Convenience function that retrieves the string value
diff -Nru json-glib-0.7.6/doc/reference/xml/json-parser.xml json-glib-0.10.2/doc/reference/xml/json-parser.xml
--- json-glib-0.7.6/doc/reference/xml/json-parser.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-parser.xml	2010-02-26 14:05:46.000000000 +0000
@@ -84,7 +84,7 @@
 <title role="details.title">Details</title>
 <refsect2 id="JsonParserError" role="enum">
 <title>enum JsonParserError</title>
-<indexterm zone="JsonParserError"><primary sortas="JsonParserError">JsonParserError</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="JsonParserError"><primary sortas="ParserError">JsonParserError</primary></indexterm><programlisting>typedef enum {
   JSON_PARSER_ERROR_PARSE,
   
   JSON_PARSER_ERROR_UNKNOWN
@@ -107,7 +107,7 @@
 </variablelist></refsect2>
 <refsect2 id="JsonParser-struct" role="struct">
 <title>JsonParser</title>
-<indexterm zone="JsonParser-struct"><primary sortas="JsonParser">JsonParser</primary></indexterm><programlisting>typedef struct _JsonParser JsonParser;</programlisting>
+<indexterm zone="JsonParser-struct"><primary sortas="Parser">JsonParser</primary></indexterm><programlisting>typedef struct _JsonParser JsonParser;</programlisting>
 <para>
 JSON data streams parser. The contents of the <link linkend="JsonParser"><type>JsonParser</type></link> structure are
 private and should only be accessed via the provided API.</para>
@@ -115,7 +115,7 @@
 </para></refsect2>
 <refsect2 id="JsonParserClass" role="struct">
 <title>JsonParserClass</title>
-<indexterm zone="JsonParserClass"><primary sortas="JsonParserClass">JsonParserClass</primary></indexterm><programlisting>typedef struct {
+<indexterm zone="JsonParserClass"><primary sortas="ParserClass">JsonParserClass</primary></indexterm><programlisting>typedef struct {
   void (* parse_start)   (JsonParser   *parser);
 
   void (* object_start)  (JsonParser   *parser);
@@ -190,7 +190,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-parser-new" role="function">
 <title>json_parser_new ()</title>
-<indexterm zone="json-parser-new"><primary sortas="json_parser_new">json_parser_new</primary></indexterm><programlisting><link linkend="JsonParser">JsonParser</link> *        json_parser_new                     (void);</programlisting>
+<indexterm zone="json-parser-new"><primary sortas="parser_new">json_parser_new</primary></indexterm><programlisting><link linkend="JsonParser">JsonParser</link> *        json_parser_new                     (void);</programlisting>
 <para>
 Creates a new <link linkend="JsonParser"><type>JsonParser</type></link> instance. You can use the <link linkend="JsonParser"><type>JsonParser</type></link> to
 load a JSON stream from either a file or a buffer and then walk the
@@ -203,7 +203,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-parser-load-from-file" role="function">
 <title>json_parser_load_from_file ()</title>
-<indexterm zone="json-parser-load-from-file"><primary sortas="json_parser_load_from_file">json_parser_load_from_file</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_parser_load_from_file          (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="json-parser-load-from-file"><primary sortas="parser_load_from_file">json_parser_load_from_file</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_parser_load_from_file          (<link linkend="JsonParser">JsonParser</link> *parser,
                                                          const <link linkend="gchar">gchar</link> *filename,
                                                          <link linkend="GError">GError</link> **error);</programlisting>
 <para>
@@ -226,7 +226,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-parser-load-from-data" role="function">
 <title>json_parser_load_from_data ()</title>
-<indexterm zone="json-parser-load-from-data"><primary sortas="json_parser_load_from_data">json_parser_load_from_data</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_parser_load_from_data          (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="json-parser-load-from-data"><primary sortas="parser_load_from_data">json_parser_load_from_data</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_parser_load_from_data          (<link linkend="JsonParser">JsonParser</link> *parser,
                                                          const <link linkend="gchar">gchar</link> *data,
                                                          <link linkend="gssize">gssize</link> length,
                                                          <link linkend="GError">GError</link> **error);</programlisting>
@@ -254,7 +254,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-parser-get-root" role="function">
 <title>json_parser_get_root ()</title>
-<indexterm zone="json-parser-get-root"><primary sortas="json_parser_get_root">json_parser_get_root</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_parser_get_root                (<link linkend="JsonParser">JsonParser</link> *parser);</programlisting>
+<indexterm zone="json-parser-get-root"><primary sortas="parser_get_root">json_parser_get_root</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_parser_get_root                (<link linkend="JsonParser">JsonParser</link> *parser);</programlisting>
 <para>
 Retrieves the top level node from the parsed JSON stream.</para>
 <para>
@@ -262,13 +262,11 @@
 <varlistentry><term><parameter>parser</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="JsonParser"><type>JsonParser</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the root <link linkend="JsonNode"><type>JsonNode</type></link> . The returned node is owned by
-  the <link linkend="JsonParser"><type>JsonParser</type></link> and should never be modified or freed.
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>transfer none. <acronym>transfer</acronym> none. </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="json-parser-get-current-line" role="function">
 <title>json_parser_get_current_line ()</title>
-<indexterm zone="json-parser-get-current-line"><primary sortas="json_parser_get_current_line">json_parser_get_current_line</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_parser_get_current_line        (<link linkend="JsonParser">JsonParser</link> *parser);</programlisting>
+<indexterm zone="json-parser-get-current-line"><primary sortas="parser_get_current_line">json_parser_get_current_line</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_parser_get_current_line        (<link linkend="JsonParser">JsonParser</link> *parser);</programlisting>
 <para>
 Retrieves the line currently parsed, starting from 1.
 </para>
@@ -286,7 +284,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-parser-get-current-pos" role="function">
 <title>json_parser_get_current_pos ()</title>
-<indexterm zone="json-parser-get-current-pos"><primary sortas="json_parser_get_current_pos">json_parser_get_current_pos</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_parser_get_current_pos         (<link linkend="JsonParser">JsonParser</link> *parser);</programlisting>
+<indexterm zone="json-parser-get-current-pos"><primary sortas="parser_get_current_pos">json_parser_get_current_pos</primary></indexterm><programlisting><link linkend="guint">guint</link>               json_parser_get_current_pos         (<link linkend="JsonParser">JsonParser</link> *parser);</programlisting>
 <para>
 Retrieves the current position inside the current line, starting
 from 0.
@@ -305,7 +303,7 @@
 </variablelist></refsect2>
 <refsect2 id="json-parser-has-assignment" role="function" condition="since:0.4">
 <title>json_parser_has_assignment ()</title>
-<indexterm zone="json-parser-has-assignment" role="0.4"><primary sortas="json_parser_has_assignment">json_parser_has_assignment</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_parser_has_assignment          (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="json-parser-has-assignment" role="0.4"><primary sortas="parser_has_assignment">json_parser_has_assignment</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_parser_has_assignment          (<link linkend="JsonParser">JsonParser</link> *parser,
                                                          <link linkend="gchar">gchar</link> **variable_name);</programlisting>
 <para>
 A JSON data stream might sometimes contain an assignment, like:
@@ -329,8 +327,7 @@
 <listitem><simpara> a <link linkend="JsonParser"><type>JsonParser</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>variable_name</parameter>&#160;:</term>
-<listitem><simpara> return location for the variable name, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
-</simpara></listitem></varlistentry>
+<listitem><simpara>out) (allow-none. <acronym>out</acronym>. <acronym>allow-none</acronym>. </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if there was an assignment, <link linkend="FALSE--CAPS"><literal>FALSE</literal></link> otherwise. If
   <parameter>variable_name</parameter> is not <link linkend="NULL--CAPS"><literal>NULL</literal></link> it will be set to the name of the variable
   used in the assignment. The string is owned by <link linkend="JsonParser"><type>JsonParser</type></link> and should
@@ -344,7 +341,7 @@
 <refsect1 id="JsonParser.signal-details" role="signals">
 <title role="signals.title">Signal Details</title>
 <refsect2 id="JsonParser-array-element" role="signal"><title>The <literal>&quot;array-element&quot;</literal> signal</title>
-<indexterm zone="JsonParser-array-element"><primary sortas="JsonParser::array-element">JsonParser::array-element</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-array-element"><primary sortas="Parser::array-element">JsonParser::array-element</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="JsonArray">JsonArray</link>  *array,
                                                         <link linkend="gint">gint</link>        index_,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
@@ -366,7 +363,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-array-end" role="signal"><title>The <literal>&quot;array-end&quot;</literal> signal</title>
-<indexterm zone="JsonParser-array-end"><primary sortas="JsonParser::array-end">JsonParser::array-end</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-array-end"><primary sortas="Parser::array-end">JsonParser::array-end</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="JsonArray">JsonArray</link>  *array,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
 <para>
@@ -383,7 +380,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-array-start" role="signal"><title>The <literal>&quot;array-start&quot;</literal> signal</title>
-<indexterm zone="JsonParser-array-start"><primary sortas="JsonParser::array-start">JsonParser::array-start</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-array-start"><primary sortas="Parser::array-start">JsonParser::array-start</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
 <para>
 The ::array-start signal is emitted each time the <link linkend="JsonParser"><type>JsonParser</type></link>
@@ -396,7 +393,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-error" role="signal"><title>The <literal>&quot;error&quot;</literal> signal</title>
-<indexterm zone="JsonParser-error"><primary sortas="JsonParser::error">JsonParser::error</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-error"><primary sortas="Parser::error">JsonParser::error</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="gpointer">gpointer</link>    error,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
 <para>
@@ -413,7 +410,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-object-end" role="signal"><title>The <literal>&quot;object-end&quot;</literal> signal</title>
-<indexterm zone="JsonParser-object-end"><primary sortas="JsonParser::object-end">JsonParser::object-end</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-object-end"><primary sortas="Parser::object-end">JsonParser::object-end</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="JsonObject">JsonObject</link> *object,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
 <para>
@@ -430,7 +427,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-object-member" role="signal"><title>The <literal>&quot;object-member&quot;</literal> signal</title>
-<indexterm zone="JsonParser-object-member"><primary sortas="JsonParser::object-member">JsonParser::object-member</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-object-member"><primary sortas="Parser::object-member">JsonParser::object-member</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="JsonObject">JsonObject</link> *object,
                                                         <link linkend="gchar">gchar</link>      *member_name,
                                                         <link linkend="gpointer">gpointer</link>    user_data)        : Run Last</programlisting>
@@ -452,7 +449,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-object-start" role="signal"><title>The <literal>&quot;object-start&quot;</literal> signal</title>
-<indexterm zone="JsonParser-object-start"><primary sortas="JsonParser::object-start">JsonParser::object-start</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-object-start"><primary sortas="Parser::object-start">JsonParser::object-start</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
 <para>
 The ::object-start signal is emitted each time the <link linkend="JsonParser"><type>JsonParser</type></link>
@@ -465,7 +462,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-parse-end" role="signal"><title>The <literal>&quot;parse-end&quot;</literal> signal</title>
-<indexterm zone="JsonParser-parse-end"><primary sortas="JsonParser::parse-end">JsonParser::parse-end</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-parse-end"><primary sortas="Parser::parse-end">JsonParser::parse-end</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
 <para>
 The ::parse-end signal is emitted when the parser successfully
@@ -478,7 +475,7 @@
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
 <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
 </variablelist></refsect2><refsect2 id="JsonParser-parse-start" role="signal"><title>The <literal>&quot;parse-start&quot;</literal> signal</title>
-<indexterm zone="JsonParser-parse-start"><primary sortas="JsonParser::parse-start">JsonParser::parse-start</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
+<indexterm zone="JsonParser-parse-start"><primary sortas="Parser::parse-start">JsonParser::parse-start</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="JsonParser">JsonParser</link> *parser,
                                                         <link linkend="gpointer">gpointer</link>    user_data)      : Run Last</programlisting>
 <para>
 The ::parse-start signal is emitted when the parser began parsing
diff -Nru json-glib-0.7.6/doc/reference/xml/json-serializable.xml json-glib-0.10.2/doc/reference/xml/json-serializable.xml
--- json-glib-0.7.6/doc/reference/xml/json-serializable.xml	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-serializable.xml	2010-02-26 14:05:46.000000000 +0000
@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
+
+<refentry id="json-glib-Serializable-Interface">
+<refmeta>
+<refentrytitle role="top_of_page" id="json-glib-Serializable-Interface.top_of_page">Serializable Interface</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>JSON-GLIB Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Serializable Interface</refname>
+<refpurpose>Interface for serialize and deserialize special GObjects</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv id="json-glib-Serializable-Interface.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
+
+<synopsis>
+                    <link linkend="JsonSerializableIface">JsonSerializableIface</link>;
+<link linkend="JsonNode">JsonNode</link> *          <link linkend="json-serializable-serialize-property">json_serializable_serialize_property</link>
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         const <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec);
+<link linkend="gboolean">gboolean</link>            <link linkend="json-serializable-deserialize-property">json_serializable_deserialize_property</link>
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec,
+                                                         <link linkend="JsonNode">JsonNode</link> *property_node);
+
+<link linkend="JsonNode">JsonNode</link> *          <link linkend="json-serializable-default-serialize-property">json_serializable_default_serialize_property</link>
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         const <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec);
+<link linkend="gboolean">gboolean</link>            <link linkend="json-serializable-default-deserialize-property">json_serializable_default_deserialize_property</link>
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec,
+                                                         <link linkend="JsonNode">JsonNode</link> *property_node);
+</synopsis>
+</refsynopsisdiv>
+
+
+
+
+
+
+
+
+
+<refsect1 id="json-glib-Serializable-Interface.description" role="desc">
+<title role="desc.title">Description</title>
+<para>
+<link linkend="JsonSerializable"><type>JsonSerializable</type></link> is an interface for <link linkend="GObject"><type>GObject</type></link> classes that
+allows controlling how the class is going to be serialized
+or deserialized by <link linkend="json-construct-gobject"><function>json_construct_gobject()</function></link> and
+<link linkend="json-serialize-gobject"><function>json_serialize_gobject()</function></link> respectively.</para>
+<para>
+</para>
+</refsect1>
+
+<refsect1 id="json-glib-Serializable-Interface.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="JsonSerializableIface" role="struct">
+<title>JsonSerializableIface</title>
+<indexterm zone="JsonSerializableIface"><primary sortas="SerializableIface">JsonSerializableIface</primary></indexterm><programlisting>typedef struct {
+  JsonNode *(* serialize_property)   (JsonSerializable *serializable,
+                                      const gchar      *property_name,
+                                      const GValue     *value,
+                                      GParamSpec       *pspec);
+  gboolean  (* deserialize_property) (JsonSerializable *serializable,
+                                      const gchar      *property_name,
+                                      GValue           *value,
+                                      GParamSpec       *pspec,
+                                      JsonNode         *property_node);
+} JsonSerializableIface;
+</programlisting>
+<para>
+Interface that allows serializing and deserializing <link linkend="GObject"><type>GObject</type></link><!-- -->s
+with properties storing complex data types. The <link linkend="json-serialize-gobject"><function>json_serialize_gobject()</function></link>
+function will check if the passed <link linkend="GObject"><type>GObject</type></link> implements this interface,
+so it can also be used to override the default property serialization
+sequence.</para>
+<para>
+</para><variablelist role="struct">
+<varlistentry>
+<term><structfield>serialize_property</structfield>&#160;()</term>
+<listitem><simpara> virtual function for serializing a <link linkend="GObject"><type>GObject</type></link> property
+  into a <link linkend="JsonNode"><type>JsonNode</type></link>
+</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term><structfield>deserialize_property</structfield>&#160;()</term>
+<listitem><simpara> virtual function for deserializing a <link linkend="JsonNode"><type>JsonNode</type></link>
+  into a <link linkend="GObject"><type>GObject</type></link> property
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="json-serializable-serialize-property" role="function">
+<title>json_serializable_serialize_property ()</title>
+<indexterm zone="json-serializable-serialize-property"><primary sortas="serializable_serialize_property">json_serializable_serialize_property</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_serializable_serialize_property
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         const <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec);</programlisting>
+<para>
+Asks a <link linkend="JsonSerializable"><type>JsonSerializable</type></link> implementation to serialize a <link linkend="GObject"><type>GObject</type></link>
+property into a <link linkend="JsonNode"><type>JsonNode</type></link> object.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>serializable</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonSerializable"><type>JsonSerializable</type></link> object
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property_name</parameter>&#160;:</term>
+<listitem><simpara> the name of the property
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara> the value of the property
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pspec</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="GParamSpec"><type>GParamSpec</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> containing the serialized property
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="json-serializable-deserialize-property" role="function">
+<title>json_serializable_deserialize_property ()</title>
+<indexterm zone="json-serializable-deserialize-property"><primary sortas="serializable_deserialize_property">json_serializable_deserialize_property</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_serializable_deserialize_property
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec,
+                                                         <link linkend="JsonNode">JsonNode</link> *property_node);</programlisting>
+<para>
+Asks a <link linkend="JsonSerializable"><type>JsonSerializable</type></link> implementation to deserialize the
+property contained inside <parameter>property_node</parameter> into <parameter>value</parameter>.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>serializable</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonSerializable"><type>JsonSerializable</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property_name</parameter>&#160;:</term>
+<listitem><simpara> the name of the property
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara> a pointer to an uninitialized <link linkend="GValue"><type>GValue</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pspec</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="GParamSpec"><type>GParamSpec</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property_node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> containing the serialized property
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the property was successfully deserialized.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="json-serializable-default-serialize-property" role="function" condition="since:0.10">
+<title>json_serializable_default_serialize_property ()</title>
+<indexterm zone="json-serializable-default-serialize-property" role="0.10"><primary sortas="serializable_default_serialize_property">json_serializable_default_serialize_property</primary></indexterm><programlisting><link linkend="JsonNode">JsonNode</link> *          json_serializable_default_serialize_property
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         const <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec);</programlisting>
+<para>
+Calls the default implementation of the <link linkend="JsonSerializable"><type>JsonSerializable</type></link>
+<link linkend="serialize-property"><function>serialize_property()</function></link> virtual function
+</para>
+<para>
+This function can be used inside a custom implementation
+of the <link linkend="serialize-property"><function>serialize_property()</function></link> virtual function in lieu of:
+</para>
+<para>
+<informalexample><programlisting>
+  JsonSerializable *iface;
+  JsonNode *node;
+
+  iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+  node = iface->serialize_property (serializable, property_name,
+                                    value,
+                                    pspec);
+</programlisting></informalexample></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>serializable</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonSerializable"><type>JsonSerializable</type></link> object
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property_name</parameter>&#160;:</term>
+<listitem><simpara> the name of the property
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara> the value of the property
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pspec</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="GParamSpec"><type>GParamSpec</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>transfer full. <acronym>transfer</acronym> full. </simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+<refsect2 id="json-serializable-default-deserialize-property" role="function" condition="since:0.10">
+<title>json_serializable_default_deserialize_property ()</title>
+<indexterm zone="json-serializable-default-deserialize-property" role="0.10"><primary sortas="serializable_default_deserialize_property">json_serializable_default_deserialize_property</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            json_serializable_default_deserialize_property
+                                                        (<link linkend="JsonSerializable">JsonSerializable</link> *serializable,
+                                                         const <link linkend="gchar">gchar</link> *property_name,
+                                                         <link linkend="GValue">GValue</link> *value,
+                                                         <link linkend="GParamSpec">GParamSpec</link> *pspec,
+                                                         <link linkend="JsonNode">JsonNode</link> *property_node);</programlisting>
+<para>
+Calls the default implementation of the <link linkend="JsonSerializable"><type>JsonSerializable</type></link>
+<link linkend="deserialize-property"><function>deserialize_property()</function></link> virtual function
+</para>
+<para>
+This function can be used inside a custom implementation
+of the <link linkend="deserialize-property"><function>deserialize_property()</function></link> virtual function in lieu of:
+</para>
+<para>
+<informalexample><programlisting>
+  JsonSerializable *iface;
+  gboolean res;
+
+  iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+  res = iface->deserialize_property (serializable, property_name,
+                                     value,
+                                     pspec,
+                                     property_node);
+</programlisting></informalexample></para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>serializable</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonSerializable"><type>JsonSerializable</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property_name</parameter>&#160;:</term>
+<listitem><simpara> the name of the property
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
+<listitem><simpara> a pointer to an uninitialized <link linkend="GValue"><type>GValue</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pspec</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="GParamSpec"><type>GParamSpec</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>property_node</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="JsonNode"><type>JsonNode</type></link> containing the serialized property
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the property was successfully deserialized.
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 0.10</para></refsect2>
+
+</refsect1>
+
+
+
+
+</refentry>
diff -Nru json-glib-0.7.6/doc/reference/xml/json-version.xml json-glib-0.10.2/doc/reference/xml/json-version.xml
--- json-glib-0.7.6/doc/reference/xml/json-version.xml	2009-08-12 16:08:13.000000000 +0100
+++ json-glib-0.10.2/doc/reference/xml/json-version.xml	2010-02-26 14:05:46.000000000 +0000
@@ -53,7 +53,7 @@
 <title role="details.title">Details</title>
 <refsect2 id="JSON-MAJOR-VERSION--CAPS" role="macro">
 <title>JSON_MAJOR_VERSION</title>
-<indexterm zone="JSON-MAJOR-VERSION--CAPS"><primary sortas="JSON_MAJOR_VERSION">JSON_MAJOR_VERSION</primary></indexterm><programlisting>#define JSON_MAJOR_VERSION              (0)
+<indexterm zone="JSON-MAJOR-VERSION--CAPS"><primary sortas="MAJOR_VERSION">JSON_MAJOR_VERSION</primary></indexterm><programlisting>#define JSON_MAJOR_VERSION              (0)
 </programlisting>
 <para>
 Json major version component (e.g. 1 if <link linkend="JSON-VERSION--CAPS"><literal>JSON_VERSION</literal></link> is 1.2.3)</para>
@@ -61,7 +61,7 @@
 </para></refsect2>
 <refsect2 id="JSON-MINOR-VERSION--CAPS" role="macro">
 <title>JSON_MINOR_VERSION</title>
-<indexterm zone="JSON-MINOR-VERSION--CAPS"><primary sortas="JSON_MINOR_VERSION">JSON_MINOR_VERSION</primary></indexterm><programlisting>#define JSON_MINOR_VERSION              (7)
+<indexterm zone="JSON-MINOR-VERSION--CAPS"><primary sortas="MINOR_VERSION">JSON_MINOR_VERSION</primary></indexterm><programlisting>#define JSON_MINOR_VERSION              (10)
 </programlisting>
 <para>
 Json minor version component (e.g. 2 if <link linkend="JSON-VERSION--CAPS"><literal>JSON_VERSION</literal></link> is 1.2.3)</para>
@@ -69,7 +69,7 @@
 </para></refsect2>
 <refsect2 id="JSON-MICRO-VERSION--CAPS" role="macro">
 <title>JSON_MICRO_VERSION</title>
-<indexterm zone="JSON-MICRO-VERSION--CAPS"><primary sortas="JSON_MICRO_VERSION">JSON_MICRO_VERSION</primary></indexterm><programlisting>#define JSON_MICRO_VERSION              (6)
+<indexterm zone="JSON-MICRO-VERSION--CAPS"><primary sortas="MICRO_VERSION">JSON_MICRO_VERSION</primary></indexterm><programlisting>#define JSON_MICRO_VERSION              (2)
 </programlisting>
 <para>
 Json micro version component (e.g. 3 if <link linkend="JSON-VERSION--CAPS"><literal>JSON_VERSION</literal></link> is 1.2.3)</para>
@@ -77,7 +77,7 @@
 </para></refsect2>
 <refsect2 id="JSON-VERSION--CAPS" role="macro">
 <title>JSON_VERSION</title>
-<indexterm zone="JSON-VERSION--CAPS"><primary sortas="JSON_VERSION">JSON_VERSION</primary></indexterm><programlisting>#define JSON_VERSION                    (0.7.6)
+<indexterm zone="JSON-VERSION--CAPS"><primary sortas="VERSION">JSON_VERSION</primary></indexterm><programlisting>#define JSON_VERSION                    (0.10.2)
 </programlisting>
 <para>
 Json version.</para>
@@ -85,7 +85,7 @@
 </para></refsect2>
 <refsect2 id="JSON-VERSION-S--CAPS" role="macro">
 <title>JSON_VERSION_S</title>
-<indexterm zone="JSON-VERSION-S--CAPS"><primary sortas="JSON_VERSION_S">JSON_VERSION_S</primary></indexterm><programlisting>#define JSON_VERSION_S                  "0.7.6"
+<indexterm zone="JSON-VERSION-S--CAPS"><primary sortas="VERSION_S">JSON_VERSION_S</primary></indexterm><programlisting>#define JSON_VERSION_S                  "0.10.2"
 </programlisting>
 <para>
 Json version, encoded as a string, useful for printing and
@@ -94,7 +94,7 @@
 </para></refsect2>
 <refsect2 id="JSON-VERSION-HEX--CAPS" role="macro">
 <title>JSON_VERSION_HEX</title>
-<indexterm zone="JSON-VERSION-HEX--CAPS"><primary sortas="JSON_VERSION_HEX">JSON_VERSION_HEX</primary></indexterm><programlisting>#define             JSON_VERSION_HEX</programlisting>
+<indexterm zone="JSON-VERSION-HEX--CAPS"><primary sortas="VERSION_HEX">JSON_VERSION_HEX</primary></indexterm><programlisting>#define             JSON_VERSION_HEX</programlisting>
 <para>
 Json version, encoded as an hexadecimal number, useful for
 integer comparisons.</para>
@@ -102,7 +102,7 @@
 </para></refsect2>
 <refsect2 id="JSON-CHECK-VERSION--CAPS" role="macro">
 <title>JSON_CHECK_VERSION()</title>
-<indexterm zone="JSON-CHECK-VERSION--CAPS"><primary sortas="JSON_CHECK_VERSION">JSON_CHECK_VERSION</primary></indexterm><programlisting>#define             JSON_CHECK_VERSION(major,minor,micro)</programlisting>
+<indexterm zone="JSON-CHECK-VERSION--CAPS"><primary sortas="CHECK_VERSION">JSON_CHECK_VERSION</primary></indexterm><programlisting>#define             JSON_CHECK_VERSION(major,minor,micro)</programlisting>
 <para>
 Compile-time version checking. Evaluates to <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the version
 of Json is greater than the required one.</para>
diff -Nru json-glib-0.7.6/INSTALL json-glib-0.10.2/INSTALL
--- json-glib-0.7.6/INSTALL	2009-08-12 16:07:33.000000000 +0100
+++ json-glib-0.10.2/INSTALL	2010-02-26 14:04:30.000000000 +0000
@@ -2,10 +2,12 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
-  5. You can remove the program binaries and object files from the
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -159,7 +222,7 @@
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +237,16 @@
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +262,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +351,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
diff -Nru json-glib-0.7.6/install-sh json-glib-0.10.2/install-sh
--- json-glib-0.7.6/install-sh	2009-08-12 16:07:32.000000000 +0100
+++ json-glib-0.10.2/install-sh	2010-02-26 14:04:29.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru json-glib-0.7.6/json-glib/json-array.c json-glib-0.10.2/json-glib/json-array.c
--- json-glib-0.7.6/json-glib/json-array.c	2009-08-12 11:34:59.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-array.c	2009-11-12 11:25:56.000000000 +0000
@@ -157,10 +157,10 @@
  *
  * Gets the elements of a #JsonArray as a list of #JsonNode<!-- -->s.
  *
- * Return value: a #GList containing the elements of the array. The
- *   contents of the list are owned by the array and should never be
- *   modified or freed. Use g_list_free() on the returned list when
- *   done using it
+ * Return value: (element-type JsonNode) (transfer container): a #GList
+ *   containing the elements of the array. The contents of the list are
+ *   owned by the array and should never be modified or freed. Use
+ *   g_list_free() on the returned list when done using it
  */
 GList *
 json_array_get_elements (JsonArray *array)
@@ -186,8 +186,8 @@
  * Retrieves a copy of the #JsonNode containing the value of the
  * element at @index_ inside a #JsonArray
  *
- * Return value: a copy of the #JsonNode at the requested index.
- *   Use json_node_free() when done.
+ * Return value: (transfer full): a copy of the #JsonNode at the requested
+ *   index. Use json_node_free() when done.
  *
  * Since: 0.6
  */
@@ -386,7 +386,7 @@
  *
  * See also: json_array_get_element(), json_node_get_array()
  *
- * Return value: the array
+ * Return value: (transfer none): the array
  *
  * Since: 0.8
  */
@@ -416,7 +416,7 @@
  *
  * See also: json_array_get_element(), json_node_get_object()
  *
- * Return value: the object
+ * Return value: (transfer none): the object
  *
  * Since: 0.8
  */
@@ -669,7 +669,7 @@
  * json_array_foreach_element:
  * @array: a #JsonArray
  * @func: the function to be called on each element
- * @data: data to be passed to the function
+ * @data: (allow-none): data to be passed to the function
  *
  * Iterates over all elements of @array and calls @func on
  * each one of them.
diff -Nru json-glib-0.7.6/json-glib/json-enum-types.c json-glib-0.10.2/json-glib/json-enum-types.c
--- json-glib-0.7.6/json-glib/json-enum-types.c	2009-08-12 16:07:40.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-enum-types.c	2010-02-26 14:05:01.000000000 +0000
@@ -12,7 +12,7 @@
 
   if (g_once_init_enter (&g_enum_type_id__volatile))
     {
-      const GEnumValue values[] = {
+      static const GEnumValue values[] = {
         { JSON_PARSER_ERROR_PARSE, "JSON_PARSER_ERROR_PARSE", "parse" },
         { JSON_PARSER_ERROR_UNKNOWN, "JSON_PARSER_ERROR_UNKNOWN", "unknown" },
         { 0, NULL, NULL }
@@ -37,7 +37,7 @@
 
   if (g_once_init_enter (&g_enum_type_id__volatile))
     {
-      const GEnumValue values[] = {
+      static const GEnumValue values[] = {
         { JSON_NODE_OBJECT, "JSON_NODE_OBJECT", "object" },
         { JSON_NODE_ARRAY, "JSON_NODE_ARRAY", "array" },
         { JSON_NODE_VALUE, "JSON_NODE_VALUE", "value" },
diff -Nru json-glib-0.7.6/json-glib/json-enum-types.c.in json-glib-0.10.2/json-glib/json-enum-types.c.in
--- json-glib-0.7.6/json-glib/json-enum-types.c.in	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-enum-types.c.in	2009-11-12 10:02:13.000000000 +0000
@@ -16,7 +16,7 @@
 
   if (g_once_init_enter (&g_enum_type_id__volatile))
     {
-      const G@Type@Value values[] = {
+      static const G@Type@Value values[] = {
 /*** END value-header ***/
 
 /*** BEGIN value-production ***/
diff -Nru json-glib-0.7.6/json-glib/json-gboxed.c json-glib-0.10.2/json-glib/json-gboxed.c
--- json-glib-0.7.6/json-glib/json-gboxed.c	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-gboxed.c	2010-01-24 19:00:18.000000000 +0000
@@ -0,0 +1,354 @@
+/* json-gboxed.c - JSON GBoxed integration
+ * 
+ * This file is part of JSON-GLib
+ *
+ * Copyright (C) 2007  OpenedHand Ltd.
+ * Copyright (C) 2009  Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Author:
+ *   Emmanuele Bassi  <ebassi@linux.intel.com>
+ */
+
+/**
+ * SECTION:json-gboxed
+ * @short_description: Serialize and deserialize GBoxed types
+ *
+ * GLib's #GBoxed type is a generic wrapper for arbitrary C structures.
+ *
+ * JSON-GLib allows serialization and deserialization of a #GBoxed type
+ * by registering functions mapping a #JsonNodeType to a specific
+ * #GType.
+ *
+ * When registering a #GBoxed type you should also register the
+ * corresponding transformation functions, e.g.:
+ *
+ * |[
+ *   GType
+ *   my_struct_get_type (void)
+ *   {
+ *     static GType boxed_type = 0;
+ *
+ *     if (boxed_type == 0)
+ *       {
+ *         boxed_type =
+ *           g_boxed_type_register_static (g_intern_static_string ("MyStruct"),
+ *                                         (GBoxedCopyFunc) my_struct_copy,
+ *                                         (GBoxedFreeFunc) my_struct_free);
+ *
+ *         json_boxed_register_serialize_func (boxed_type, JSON_NODE_OBJECT,
+ *                                             my_struct_serialize);
+ *         json_boxed_register_deserialize_func (boxed_type, JSON_NODE_OBJECT,
+ *                                               my_struct_deserialize);
+ *       }
+ *
+ *     return boxed_type;
+ *   }
+ * ]|
+ *
+ * The serialization function will be invoked by json_boxed_serialize():
+ * it will be passed a pointer to the C structure and it must return a
+ * #JsonNode. The deserialization function will be invoked by
+ * json_boxed_deserialize(): it will be passed a #JsonNode for the
+ * declared type and it must return a newly allocated C structure.
+ *
+ * It is possible to check whether a #GBoxed type can be deserialized
+ * from a specific #JsonNodeType, and whether a #GBoxed can be serialized
+ * and to which specific #JsonNodeType.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "json-types-private.h"
+#include "json-gobject.h"
+
+typedef struct _BoxedTransform  BoxedTransform;
+
+struct _BoxedTransform
+{
+  GType boxed_type;
+  gint node_type;
+
+  JsonBoxedSerializeFunc serialize;
+  JsonBoxedDeserializeFunc deserialize;
+};
+
+G_LOCK_DEFINE_STATIC (boxed_serialize);
+static GSList *boxed_serialize = NULL;
+
+G_LOCK_DEFINE_STATIC (boxed_deserialize);
+static GSList *boxed_deserialize = NULL;
+
+static gint
+boxed_transforms_cmp (gconstpointer a,
+                      gconstpointer b)
+{
+  const BoxedTransform *ta = a;
+  const BoxedTransform *tb = b;
+
+  return tb->boxed_type - ta->boxed_type;
+}
+
+static gint
+boxed_transforms_find (gconstpointer a,
+                       gconstpointer b)
+{
+  const BoxedTransform *haystack = a;
+  const BoxedTransform *needle = b;
+
+  if (needle->node_type != -1)
+    return (haystack->boxed_type == needle->boxed_type &&
+            haystack->node_type == needle->node_type) ? 0 : 1;
+  else
+    return (haystack->boxed_type == needle->boxed_type) ? 0 : 1;
+}
+
+static BoxedTransform *
+lookup_boxed_transform (GSList       *transforms,
+                        GType         gboxed_type,
+                        JsonNodeType  node_type)
+{
+  BoxedTransform lookup;
+  GSList *t;
+
+  lookup.boxed_type = gboxed_type;
+  lookup.node_type = node_type;
+
+  t = g_slist_find_custom (transforms, &lookup, boxed_transforms_find);
+  if (t == NULL)
+    return NULL;
+
+  return t->data;
+}
+
+/**
+ * json_boxed_register_serialize_func:
+ * @gboxed_type: a boxed type
+ * @node_type: a node type
+ * @serialize_func: serialization function for @boxed_type into
+ *   a #JsonNode of type @node_type
+ *
+ * Registers a serialization function for a #GBoxed of type @gboxed_type
+ * to a #JsonNode of type @node_type
+ *
+ * Since: 0.10
+ */
+void
+json_boxed_register_serialize_func (GType                  gboxed_type,
+                                    JsonNodeType           node_type,
+                                    JsonBoxedSerializeFunc serialize_func)
+{
+  BoxedTransform *t;
+
+  g_return_if_fail (G_TYPE_IS_BOXED (gboxed_type));
+  g_return_if_fail (G_TYPE_IS_ABSTRACT (gboxed_type) == FALSE);
+
+  G_LOCK (boxed_serialize);
+
+  t = lookup_boxed_transform (boxed_serialize, gboxed_type, node_type);
+  if (t == NULL)
+    {
+      t = g_slice_new (BoxedTransform);
+
+      t->boxed_type = gboxed_type;
+      t->node_type = node_type;
+      t->serialize = serialize_func;
+
+      boxed_serialize = g_slist_insert_sorted (boxed_serialize, t,
+                                               boxed_transforms_cmp);
+    }
+  else
+    g_warning ("A serialization function for the boxed type %s into "
+               "JSON nodes of type %s already exists",
+               g_type_name (gboxed_type),
+               json_node_type_get_name (node_type));
+
+  G_UNLOCK (boxed_serialize);
+}
+
+/**
+ * json_boxed_register_deserialize_func:
+ * @gboxed_type: a boxed type
+ * @node_type: a node type
+ * @deserialize_func: deserialization function for @boxed_type from
+ *   a #JsonNode of type @node_type
+ *
+ * Registers a deserialization function for a #GBoxed of type @gboxed_type
+ * from a #JsonNode of type @node_type
+ *
+ * Since: 0.10
+ */
+void
+json_boxed_register_deserialize_func (GType                    gboxed_type,
+                                      JsonNodeType             node_type,
+                                      JsonBoxedDeserializeFunc deserialize_func)
+{
+  BoxedTransform *t;
+
+  g_return_if_fail (G_TYPE_IS_BOXED (gboxed_type));
+  g_return_if_fail (G_TYPE_IS_ABSTRACT (gboxed_type) == FALSE);
+
+  G_LOCK (boxed_deserialize);
+
+  t = lookup_boxed_transform (boxed_deserialize, gboxed_type, node_type);
+  if (t == NULL)
+    {
+      t = g_slice_new (BoxedTransform);
+
+      t->boxed_type = gboxed_type;
+      t->node_type = node_type;
+      t->deserialize = deserialize_func;
+
+      boxed_deserialize = g_slist_insert_sorted (boxed_deserialize, t,
+                                                 boxed_transforms_cmp);
+    }
+  else
+    g_warning ("A deserialization function for the boxed type %s from "
+               "JSON nodes of type %s already exists",
+               g_type_name (gboxed_type),
+               json_node_type_get_name (node_type));
+
+  G_UNLOCK (boxed_deserialize);
+}
+
+/**
+ * json_boxed_can_serialize:
+ * @gboxed_type: a boxed type
+ * @node_type: (out): the #JsonNode type to which the boxed type can be
+ *   serialized into
+ *
+ * Checks whether it is possible to serialize a #GBoxed of
+ * type @gboxed_type into a #JsonNode. The type of the
+ * #JsonNode is placed inside @node_type if the function
+ * returns %TRUE and it's undefined otherwise.
+ *
+ * Return value: %TRUE if the type can be serialized,
+ *   and %FALSE otherwise.
+ *
+ * Since: 0.10
+ */
+gboolean
+json_boxed_can_serialize (GType         gboxed_type,
+                          JsonNodeType *node_type)
+{
+  BoxedTransform *t;
+
+  g_return_val_if_fail (G_TYPE_IS_BOXED (gboxed_type), FALSE);
+  g_return_val_if_fail (G_TYPE_IS_ABSTRACT (gboxed_type) == FALSE, FALSE);
+
+  t = lookup_boxed_transform (boxed_serialize, gboxed_type, -1);
+  if (t != NULL)
+    {
+      if (node_type)
+        *node_type = t->node_type;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * json_boxed_can_deserialize:
+ * @gboxed_type: a boxed type
+ * @node_type: a #JsonNode type
+ *
+ * Checks whether it is possible to deserialize a #GBoxed of
+ * type @gboxed_type from a #JsonNode of type @node_type
+ *
+ * Return value: %TRUE if the type can be deserialized, %FALSE otherwise
+ *
+ * Since: 0.10
+ */
+gboolean
+json_boxed_can_deserialize (GType        gboxed_type,
+                            JsonNodeType node_type)
+{
+  BoxedTransform *t;
+
+  g_return_val_if_fail (G_TYPE_IS_BOXED (gboxed_type), FALSE);
+  g_return_val_if_fail (G_TYPE_IS_ABSTRACT (gboxed_type) == FALSE, FALSE);
+
+  t = lookup_boxed_transform (boxed_deserialize, gboxed_type, node_type);
+  if (t != NULL)
+    return TRUE;
+
+  return FALSE;
+}
+
+/**
+ * json_boxed_serialize:
+ * @gboxed_type: a boxed type
+ * @boxed: a pointer to a #GBoxed of type @gboxed_type
+ *
+ * Serializes @boxed, a pointer to a #GBoxed of type @gboxed_type,
+ * into a #JsonNode
+ *
+ * Return value: a #JsonNode with the serialization of the boxed
+ *   type, or %NULL if serialization either failed or was not
+ *   possible
+ *
+ * Since: 0.10
+ */
+JsonNode *
+json_boxed_serialize (GType         gboxed_type,
+                      gconstpointer boxed)
+{
+  BoxedTransform *t;
+
+  g_return_val_if_fail (G_TYPE_IS_BOXED (gboxed_type), NULL);
+  g_return_val_if_fail (G_TYPE_IS_ABSTRACT (gboxed_type) == FALSE, NULL);
+  g_return_val_if_fail (boxed != NULL, NULL);
+
+  t = lookup_boxed_transform (boxed_serialize, gboxed_type, -1);
+  if (t != NULL && t->serialize != NULL)
+    return t->serialize (boxed);
+
+  return NULL;
+}
+
+/**
+ * json_boxed_deserialize:
+ * @gboxed_type: a boxed type
+ * @node: a #JsonNode
+ *
+ * Deserializes @node into a #GBoxed of @gboxed_type
+ *
+ * Return value: the newly allocated #GBoxed. Use g_boxed_free() to
+ *   release the resources allocated by this function
+ *
+ * Since: 0.10
+ */
+gpointer
+json_boxed_deserialize (GType     gboxed_type,
+                        JsonNode *node)
+{
+  JsonNodeType node_type;
+  BoxedTransform *t;
+
+  g_return_val_if_fail (G_TYPE_IS_BOXED (gboxed_type), NULL);
+  g_return_val_if_fail (G_TYPE_IS_ABSTRACT (gboxed_type) == FALSE, NULL);
+  g_return_val_if_fail (node != NULL, NULL);
+
+  node_type = json_node_get_node_type (node);
+
+  t = lookup_boxed_transform (boxed_deserialize, gboxed_type, node_type);
+  if (t != NULL && t->deserialize != NULL)
+    return t->deserialize (node);
+
+  return NULL;
+}
diff -Nru json-glib-0.7.6/json-glib/json-generator.c json-glib-0.10.2/json-glib/json-generator.c
--- json-glib-0.7.6/json-glib/json-generator.c	2009-08-12 11:34:20.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-generator.c	2009-11-12 11:37:20.000000000 +0000
@@ -306,7 +306,12 @@
       break;
 
     case G_TYPE_DOUBLE:
-      g_string_append_printf (buffer, "%f", g_value_get_double (&value));
+      {
+        gchar buf[65];
+
+        g_ascii_formatd (buf, 65, "%d", g_value_get_double (&value));
+        g_string_append (buffer, buf);
+      }
       break;
 
     case G_TYPE_BOOLEAN:
@@ -532,13 +537,14 @@
 /**
  * json_generator_to_data:
  * @generator: a #JsonGenerator
- * @length: return location for the length of the returned buffer, or %NULL
+ * @length: (out): return location for the length of the returned
+ *   buffer, or %NULL
  *
  * Generates a JSON data stream from @generator and returns it as a
  * buffer.
  *
- * Return value: a newly allocated buffer holding a JSON data stream. Use
- *   g_free() to free the allocated resources.
+ * Return value: a newly allocated buffer holding a JSON data stream.
+ *   Use g_free() to free the allocated resources.
  */
 gchar *
 json_generator_to_data (JsonGenerator *generator,
@@ -620,8 +626,8 @@
  * Sets @node as the root of the JSON data stream to be serialized by
  * the #JsonGenerator.
  *
- * Note: the node is copied by the generator object, so it can be safely
- * freed after calling this function.
+ * <note>The node is copied by the generator object, so it can be safely
+ * freed after calling this function.</note>
  */
 void
 json_generator_set_root (JsonGenerator *generator,
diff -Nru json-glib-0.7.6/json-glib/json-gobject.c json-glib-0.10.2/json-glib/json-gobject.c
--- json-glib-0.7.6/json-glib/json-gobject.c	2009-08-12 12:01:32.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-gobject.c	2009-12-29 10:21:25.000000000 +0000
@@ -1,4 +1,4 @@
-/* json-gobject.h - JSON GObject integration
+/* json-gobject.c - JSON GObject integration
  * 
  * This file is part of JSON-GLib
  * Copyright (C) 2007  OpenedHand Ltd.
@@ -40,8 +40,8 @@
 #include <stdlib.h>
 
 #include "json-types-private.h"
+#include "json-gobject-private.h"
 
-#include "json-gobject.h"
 #include "json-parser.h"
 #include "json-generator.h"
 
@@ -173,7 +173,218 @@
   return ret;
 }
 
-static gboolean
+static GObject *
+json_gobject_new (GType       gtype,
+                  JsonObject *object)
+{
+  JsonSerializableIface *iface = NULL;
+  JsonSerializable *serializable = NULL;
+  gboolean deserialize_property;
+  GList *members, *members_left, *l;
+  guint n_members;
+  GObjectClass *klass;
+  GObject *retval;
+  GArray *construct_params;
+  gint i;
+
+  klass = g_type_class_ref (gtype);
+
+  n_members = json_object_get_size (object);
+  members = json_object_get_members (object);
+  members_left = NULL;
+
+  /* first pass: construct and construct-only properties; here
+   * we cannot use Serializable because we don't have an
+   * instance yet; we use the default implementation of
+   * json_deserialize_pspec() to deserialize known types
+   *
+   * FIXME - find a way to allow deserialization for these
+   * properties
+   */
+  construct_params = g_array_sized_new (FALSE, FALSE, sizeof (GParameter), n_members);
+
+  for (l = members; l != NULL; l = l->next)
+    {
+      const gchar *member_name = l->data;
+      GParamSpec *pspec;
+      GParameter param = { NULL, };
+      JsonNode *val;
+      gboolean res = FALSE;
+
+      pspec = g_object_class_find_property (klass, member_name);
+      if (!pspec)
+        goto next_member;
+
+      if (!(pspec->flags & G_PARAM_CONSTRUCT_ONLY) ||
+          !(pspec->flags & G_PARAM_CONSTRUCT_ONLY))
+        goto next_member;
+
+      if (!(pspec->flags & G_PARAM_WRITABLE))
+        goto next_member;
+
+      g_value_init (&param.value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+
+      val = json_object_get_member (object, member_name);
+      res = json_deserialize_pspec (&param.value, pspec, val);
+      if (!res)
+        g_value_unset (&param.value);
+      else
+        {
+          param.name = g_strdup (pspec->name);
+
+          g_array_append_val (construct_params, param);
+
+          continue;
+        }
+
+    next_member:
+      members_left = g_list_prepend (members_left, l->data);
+    }
+
+  retval = g_object_newv (gtype,
+                          construct_params->len,
+                          (GParameter *) construct_params->data);
+
+  /* free the contents of the GArray */
+  for (i = 0; i < construct_params->len; i++)
+    {
+      GParameter *param = &g_array_index (construct_params, GParameter, i);
+
+      g_free ((gchar *) param->name);
+      g_value_unset (&param->value);
+    }
+
+  g_array_free (construct_params, TRUE);
+  g_list_free (members);
+
+  /* we use g_list_prepend() above, but we want to maintain
+   * the ordering of json_object_get_members() here
+   */
+  members = g_list_reverse (members_left);
+
+  /* do the Serializable type check once */
+  if (g_type_is_a (gtype, JSON_TYPE_SERIALIZABLE))
+    {
+      serializable = JSON_SERIALIZABLE (retval);
+      iface = JSON_SERIALIZABLE_GET_IFACE (serializable);
+      deserialize_property = (iface->deserialize_property != NULL);
+    }
+  else
+    deserialize_property = FALSE;
+
+  g_object_freeze_notify (retval);
+
+  for (l = members; l != NULL; l = l->next)
+    {
+      const gchar *member_name = l->data;
+      GParamSpec *pspec;
+      JsonNode *val;
+      GValue value = { 0, };
+      gboolean res = FALSE;
+
+      pspec = g_object_class_find_property (klass, member_name);
+      if (!pspec)
+        continue;
+
+      /* we should have dealt with these above */
+      if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) ||
+          (pspec->flags & G_PARAM_CONSTRUCT))
+        continue;
+
+      if (!(pspec->flags & G_PARAM_WRITABLE))
+        continue;
+
+      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+
+      val = json_object_get_member (object, member_name);
+
+      if (deserialize_property)
+        {
+          res = iface->deserialize_property (serializable, pspec->name,
+                                             &value,
+                                             pspec,
+                                             val);
+        }
+
+      if (!res)
+        res = json_deserialize_pspec (&value, pspec, val);
+
+      /* FIXME - we probably want to be able to have a custom
+       * set_property() for Serializable implementations
+       */
+      if (res)
+        g_object_set_property (retval, pspec->name, &value);
+
+      g_value_unset (&value);
+    }
+
+  g_list_free (members);
+
+  g_object_thaw_notify (retval);
+
+  g_type_class_unref (klass);
+
+  return retval;
+}
+
+static JsonObject *
+json_gobject_dump (GObject *gobject)
+{
+  JsonSerializableIface *iface = NULL;
+  JsonSerializable *serializable = NULL;
+  gboolean serialize_property = FALSE;
+  JsonObject *object;
+  GParamSpec **pspecs;
+  guint n_pspecs, i;
+
+  if (JSON_IS_SERIALIZABLE (gobject))
+    {
+      serializable = JSON_SERIALIZABLE (gobject);
+      iface = JSON_SERIALIZABLE_GET_IFACE (gobject);
+      serialize_property = (iface->serialize_property != NULL);
+    }
+
+  object = json_object_new ();
+
+  pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (gobject), &n_pspecs);
+  for (i = 0; i < n_pspecs; i++)
+    {
+      GParamSpec *pspec = pspecs[i];
+      GValue value = { 0, };
+      JsonNode *node = NULL;
+
+      /* read only what we can */
+      if (!(pspec->flags & G_PARAM_READABLE))
+        continue;
+
+      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+      g_object_get_property (gobject, pspec->name, &value);
+
+      /* if there is a serialization vfunc, then it is completely responsible
+       * for serializing the property, possibly by calling the implementation
+       * of the default JsonSerializable interface through chaining up
+       */
+      if (serialize_property)
+        {
+          node = iface->serialize_property (serializable, pspec->name,
+                                            &value,
+                                            pspec);
+        }
+      else
+        node = json_serialize_pspec (&value, pspec);
+
+      if (node)
+        json_object_set_member (object, pspec->name, node);
+
+      g_value_unset (&value);
+    }
+
+  g_free (pspecs);
+
+  return object;
+}
+
+gboolean
 json_deserialize_pspec (GValue     *value,
                         GParamSpec *pspec,
                         JsonNode   *node)
@@ -181,10 +392,37 @@
   GValue node_value = { 0, };
   gboolean retval = FALSE;
 
+  if (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value)) == G_TYPE_BOXED)
+    {
+      JsonNodeType node_type = json_node_get_node_type (node);
+      GType boxed_type = G_VALUE_TYPE (value);
+
+      if (json_boxed_can_deserialize (boxed_type, node_type))
+        {
+          gpointer boxed = json_boxed_deserialize (boxed_type, node);
+
+          g_value_take_boxed (value, boxed);
+
+          return TRUE;
+        }
+    }
+
   switch (JSON_NODE_TYPE (node))
     {
     case JSON_NODE_OBJECT:
-      return FALSE;
+      if (g_type_is_a (G_VALUE_TYPE (value), G_TYPE_OBJECT))
+        {
+          GObject *object;
+
+          object = json_gobject_new (G_VALUE_TYPE (value), json_node_get_object (node));
+          if (object != NULL)
+            g_value_take_object (value, object);
+          else
+            g_value_set_object (value, NULL);
+
+          retval = TRUE;
+        }
+      break;
 
     case JSON_NODE_ARRAY:
       if (G_VALUE_HOLDS (value, G_TYPE_STRV))
@@ -200,7 +438,7 @@
               if (JSON_NODE_TYPE (val) != JSON_NODE_VALUE)
                 continue;
 
-              if (json_node_get_string (val) != NULL);
+              if (json_node_get_string (val) != NULL)
                 g_ptr_array_add (str_array, (gpointer) json_node_get_string (val));
             }
 
@@ -265,7 +503,7 @@
 
         case G_TYPE_ENUM:
           {
-            gint enum_value;
+            gint enum_value = 0;
 
             if (G_VALUE_HOLDS (&node_value, G_TYPE_INT64))
               {
@@ -286,7 +524,7 @@
 
         case G_TYPE_FLAGS:
           {
-            gint flags_value;
+            gint flags_value = 0;
 
             if (G_VALUE_HOLDS (&node_value, G_TYPE_INT64))
               {
@@ -321,12 +559,13 @@
   return retval;
 }
 
-static JsonNode *
+JsonNode *
 json_serialize_pspec (const GValue *real_value,
                       GParamSpec   *pspec)
 {
   JsonNode *retval = NULL;
   GValue value = { 0, };
+  JsonNodeType node_type;
 
   switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (real_value)))
     {
@@ -341,18 +580,8 @@
       g_value_unset (&value);
       break;
 
-    case G_TYPE_INT:
-      retval = json_node_new (JSON_NODE_VALUE);
-      json_node_set_int (retval, g_value_get_int (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));
-      break;
-
     case G_TYPE_STRING:
-      /* strings might be NULL */
+      /* strings might be NULL, so we handle it differently */
       if (!g_value_get_string (real_value))
         retval = json_node_new (JSON_NODE_NULL);
       else
@@ -363,6 +592,16 @@
         }
       break;
 
+    case G_TYPE_INT:
+      retval = json_node_new (JSON_NODE_VALUE);
+      json_node_set_int (retval, g_value_get_int (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));
+      break;
+
     case G_TYPE_BOXED:
       if (G_VALUE_HOLDS (real_value, G_TYPE_STRV))
         {
@@ -384,11 +623,15 @@
           retval = json_node_new (JSON_NODE_ARRAY);
           json_node_take_array (retval, array);
         }
-      else
+      else if (json_boxed_can_serialize (G_VALUE_TYPE (real_value), &node_type))
         {
-          g_warning ("Unsupported type `%s'",
-                     g_type_name (G_VALUE_TYPE (real_value)));
+          gpointer boxed = g_value_get_boxed (real_value);
+
+          retval = json_boxed_serialize (G_VALUE_TYPE (real_value), boxed);
         }
+      else
+        g_warning ("Boxed type '%s' is not handled by JSON-GLib",
+                   g_type_name (G_VALUE_TYPE (real_value)));
       break;
 
     case G_TYPE_UINT:
@@ -426,13 +669,26 @@
       json_node_set_int (retval, g_value_get_flags (real_value));
       break;
 
+    case G_TYPE_OBJECT:
+      {
+        GObject *object = g_value_get_object (real_value);
+
+        if (object != NULL)
+          {
+            retval = json_node_new (JSON_NODE_OBJECT);
+            json_node_take_object (retval, json_gobject_dump (object));
+          }
+        else
+          retval = json_node_new (JSON_NODE_NULL);
+      }
+      break;
+
     case G_TYPE_NONE:
       retval = json_node_new (JSON_NODE_NULL);
       break;
 
     default:
-      g_warning ("Unsupported type `%s'",
-                 g_type_name (G_VALUE_TYPE (real_value)));
+      g_warning ("Unsupported type `%s'", g_type_name (G_VALUE_TYPE (real_value)));
       break;
     }
 
@@ -440,129 +696,62 @@
 }
 
 /**
- * json_serializable_serialize_property:
- * @serializable: a #JsonSerializable object
- * @property_name: the name of the property
- * @value: the value of the property
- * @pspec: a #GParamSpec
- *
- * Asks a #JsonSerializable implementation to serialize a #GObject
- * property into a #JsonNode object.
+ * json_gobject_deserialize:
+ * @gtype: the type of the #GObject to create
+ * @node: a #JsonNode of type %JSON_NODE_OBJECT describing the
+ *   instance of type @gtype
+ *
+ * Creates a new #GObject of type @gtype, and constructs it
+ * using the members of the passed #JsonObject
+ *
+ * Return value: (transfer full): The newly created #GObject
+ *   instance. Use g_object_unref() to free the resources
+ *   allocated by this function
  *
- * Return value: a #JsonNode containing the serialize property
+ * Since: 0.10
  */
-JsonNode *
-json_serializable_serialize_property (JsonSerializable *serializable,
-                                      const gchar      *property_name,
-                                      const GValue     *value,
-                                      GParamSpec       *pspec)
+GObject *
+json_gobject_deserialize (GType     gtype,
+                          JsonNode *node)
 {
-  JsonSerializableIface *iface;
-
-  g_return_val_if_fail (JSON_IS_SERIALIZABLE (serializable), NULL);
-  g_return_val_if_fail (property_name != NULL, NULL);
-  g_return_val_if_fail (value != NULL, NULL);
-  g_return_val_if_fail (pspec != NULL, NULL);
-
-  iface = JSON_SERIALIZABLE_GET_IFACE (serializable);
+  g_return_val_if_fail (g_type_is_a (gtype, G_TYPE_OBJECT), NULL);
+  g_return_val_if_fail (JSON_NODE_TYPE (node) == JSON_NODE_OBJECT, NULL);
 
-  return iface->serialize_property (serializable, property_name, value, pspec);
+  return json_gobject_new (gtype, json_node_get_object (node));
 }
 
 /**
- * json_serializable_deserialize_property:
- * @serializable: a #JsonSerializable
- * @property_name: the name of the property
- * @value: a pointer to an uninitialized #GValue
- * @pspec: a #GParamSpec
- * @property_node: a #JsonNode containing the serialized property
+ * json_gobject_serialize:
+ * @gobject: a #GObject
  *
- * Asks a #JsonSerializable implementation to deserialize the
- * property contained inside @property_node into @value.
+ * Creates a #JsonNode representing the passed #GObject
+ * instance. Each member of the returned JSON object will
+ * map to a property of the #GObject
+ *
+ * Return value: (transfer full): the newly created #JsonNode
+ *   of type %JSON_NODE_OBJECT. Use json_node_free() to free
+ *   the resources allocated by this function
  *
- * Return value: %TRUE if the property was successfully deserialized.
+ * Since: 0.10
  */
-gboolean
-json_serializable_deserialize_property (JsonSerializable *serializable,
-                                        const gchar      *property_name,
-                                        GValue           *value,
-                                        GParamSpec       *pspec,
-                                        JsonNode         *property_node)
-{
-  JsonSerializableIface *iface;
-
-  g_return_val_if_fail (JSON_IS_SERIALIZABLE (serializable), FALSE);
-  g_return_val_if_fail (property_name != NULL, FALSE);
-  g_return_val_if_fail (value != NULL, FALSE);
-  g_return_val_if_fail (pspec != NULL, FALSE);
-  g_return_val_if_fail (property_node != NULL, FALSE);
-
-  iface = JSON_SERIALIZABLE_GET_IFACE (serializable);
-
-  return iface->deserialize_property (serializable,
-                                      property_name,
-                                      value,
-                                      pspec,
-                                      property_node);
-}
-
-static gboolean
-json_serializable_real_deserialize (JsonSerializable *serializable,
-                                    const gchar      *name,
-                                    GValue           *value,
-                                    GParamSpec       *pspec,
-                                    JsonNode         *node)
-{
-  return json_deserialize_pspec (value, pspec, node);
-}
-
-static JsonNode *
-json_serializable_real_serialize (JsonSerializable *serializable,
-                                  const gchar      *name,
-                                  const GValue     *value,
-                                  GParamSpec       *pspec)
-{
-  return json_serialize_pspec (value, pspec);
-}
-
-static void
-json_serializable_base_init (gpointer g_class,
-                             gpointer data)
+JsonNode *
+json_gobject_serialize (GObject *gobject)
 {
-  static gboolean is_initialized = FALSE;
+  JsonNode *retval;
 
-  if (G_UNLIKELY (!is_initialized))
-    {
-      JsonSerializableIface *iface = g_class;
-
-      iface->serialize_property = json_serializable_real_serialize;
-      iface->deserialize_property = json_serializable_real_deserialize;
-
-      is_initialized = TRUE;
-    }
-}
+  g_return_val_if_fail (G_IS_OBJECT (gobject), NULL);
 
-GType
-json_serializable_get_type (void)
-{
-  static GType iface_type = 0;
+  retval = json_node_new (JSON_NODE_OBJECT);
+  json_node_take_object (retval, json_gobject_dump (gobject));
 
-  if (!iface_type)
-    iface_type =
-      g_type_register_static_simple (G_TYPE_INTERFACE,
-                                     g_intern_static_string ("JsonSerializable"),
-                                     sizeof (JsonSerializableIface),
-                                     json_serializable_base_init,
-                                     0, NULL, 0);
-
-  return iface_type;
+  return retval;
 }
 
 /**
  * json_construct_gobject:
  * @gtype: the #GType of object to construct
  * @data: a JSON data stream
- * @length: length of the data stream, or -1 if it is NUL-terminated
+ * @length: length of the data stream
  * @error: return location for a #GError, or %NULL
  *
  * Deserializes a JSON data stream and creates the corresponding
@@ -576,6 +765,8 @@
  * Return value: a #GObject or %NULL
  *
  * Since: 0.4
+ *
+ * Deprecated: 0.10: Use json_gobject_from_data() instead
  */
 GObject *
 json_construct_gobject (GType         gtype,
@@ -583,16 +774,37 @@
                         gsize         length,
                         GError      **error)
 {
-  JsonSerializableIface *iface = NULL;
-  JsonSerializable *serializable = NULL;
-  gboolean deserialize_property;
+  return json_gobject_from_data (gtype, data, strlen (data), error);
+}
+
+/**
+ * json_gobject_from_data:
+ * @gtype: the #GType of object to construct
+ * @data: a JSON data stream
+ * @length: length of the data stream, or -1 if it is NUL-terminated
+ * @error: return location for a #GError, or %NULL
+ *
+ * Deserializes a JSON data stream and creates the corresponding
+ * #GObject class. If @gtype implements the #JsonSerializableIface
+ * interface, it will be asked to deserialize all the JSON members
+ * into the respective properties; otherwise, the default implementation
+ * will be used to translate the compatible JSON native types.
+ *
+ * Note: the JSON data stream must be an object declaration.
+ *
+ * Return value: a #GObject or %NULL
+ *
+ * Since: 0.10
+ */
+GObject *
+json_gobject_from_data (GType         gtype,
+                        const gchar  *data,
+                        gssize        length,
+                        GError      **error)
+{
   JsonParser *parser;
   JsonNode *root;
-  JsonObject *object;
   GError *parse_error;
-  GList *members, *l;
-  guint n_members;
-  GObjectClass *klass;
   GObject *retval;
 
   g_return_val_if_fail (gtype != G_TYPE_INVALID, NULL);
@@ -624,69 +836,8 @@
       return NULL;
     }
 
-  klass = g_type_class_ref (gtype);
-  retval = g_object_new (gtype, NULL);
+  retval = json_gobject_deserialize (gtype, root);
 
-  if (g_type_is_a (gtype, JSON_TYPE_SERIALIZABLE))
-    {
-      serializable = JSON_SERIALIZABLE (retval);
-      iface = JSON_SERIALIZABLE_GET_IFACE (serializable);
-      deserialize_property = (iface->deserialize_property != NULL);
-    }
-  else
-    deserialize_property = FALSE;
-
-  object = json_node_get_object (root);
-
-  g_object_freeze_notify (retval);
-
-  n_members = json_object_get_size (object);
-  members = json_object_get_members (object);
-
-  for (l = members; l != NULL; l = l->next)
-    {
-      const gchar *member_name = l->data;
-      GParamSpec *pspec;
-      JsonNode *val;
-      GValue value = { 0, };
-      gboolean res = FALSE;
-
-      pspec = g_object_class_find_property (klass, member_name);
-      if (!pspec)
-        continue;
-
-      if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
-        continue;
-
-      if (!(pspec->flags & G_PARAM_WRITABLE))
-        continue;
-
-      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
-
-      val = json_object_get_member (object, member_name);
-
-      if (deserialize_property)
-        {
-          res = iface->deserialize_property (serializable, pspec->name,
-                                             &value,
-                                             pspec,
-                                             val);
-        }
-
-      if (!res)
-        res = json_deserialize_pspec (&value, pspec, val);
-
-      if (res)
-        g_object_set_property (retval, pspec->name, &value);
-
-      g_value_unset (&value);
-    }
-
-  g_list_free (members);
-
-  g_object_thaw_notify (retval);
-
-  g_type_class_unref (klass);
   g_object_unref (parser);
 
   return retval;
@@ -695,7 +846,7 @@
 /**
  * json_serialize_gobject:
  * @gobject: a #GObject
- * @length: return value for the length of the buffer, or %NULL
+ * @length: (out): return value for the length of the buffer, or %NULL
  *
  * Serializes a #GObject into a JSON data stream. If @gobject implements
  * the #JsonSerializableIface interface, it will be asked to serizalize all
@@ -703,67 +854,44 @@
  * translate the compatible types into JSON native types.
  *
  * Return value: a JSON data stream representing the passed #GObject
+ *
+ * Deprecated: 0.10: Use json_gobject_to_data() instead
  */
 gchar *
 json_serialize_gobject (GObject *gobject,
                         gsize   *length)
 {
-  JsonSerializableIface *iface = NULL;
-  JsonSerializable *serializable = NULL;
-  gboolean serialize_property = FALSE;
+  return json_gobject_to_data (gobject, length);
+}
+
+/**
+ * json_gobject_to_data:
+ * @gobject: a #GObject
+ * @length: (out): return value for the length of the buffer, or %NULL
+ *
+ * Serializes a #GObject into a JSON data stream, iterating recursively
+ * over each property.
+ *
+ * If @gobject implements the #JsonSerializableIface interface, it will
+ * be asked to serialize all its properties; otherwise, the default
+ * implementation will be use to translate the compatible types into
+ * JSON native types.
+ *
+ * Return value: a JSON data stream representing the passed #GObject
+ *
+ * Since: 0.10
+ */
+gchar *
+json_gobject_to_data (GObject *gobject,
+                      gsize   *length)
+{
   JsonGenerator *gen;
   JsonNode *root;
-  JsonObject *object;
-  GParamSpec **pspecs;
-  guint n_pspecs, i;
   gchar *data;
 
   g_return_val_if_fail (G_OBJECT (gobject), NULL);
 
-  if (JSON_IS_SERIALIZABLE (gobject))
-    {
-      serializable = JSON_SERIALIZABLE (gobject);
-      iface = JSON_SERIALIZABLE_GET_IFACE (gobject);
-      serialize_property = (iface->serialize_property != NULL);
-    }
-
-  object = json_object_new ();
-
-  root = json_node_new (JSON_NODE_OBJECT);
-  json_node_take_object (root, object);
-
-  pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (gobject),
-                                           &n_pspecs);
-  for (i = 0; i < n_pspecs; i++)
-    {
-      GParamSpec *pspec = pspecs[i];
-      GValue value = { 0, };
-      JsonNode *node = NULL;
-
-      /* read only what we can */
-      if (!(pspec->flags & G_PARAM_READABLE))
-        continue;
-
-      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
-      g_object_get_property (gobject, pspec->name, &value);
-
-      if (serialize_property)
-        {
-          node = iface->serialize_property (serializable, pspec->name,
-                                            &value,
-                                            pspec);
-        }
-
-      if (!node)
-        node = json_serialize_pspec (&value, pspec);
-
-      if (node)
-        json_object_set_member (object, pspec->name, node);
-
-      g_value_unset (&value);
-    }
-
-  g_free (pspecs);
+  root = json_gobject_serialize (gobject);
 
   gen = g_object_new (JSON_TYPE_GENERATOR,
                       "root", root,
@@ -773,6 +901,7 @@
 
   data = json_generator_to_data (gen, length);
   g_object_unref (gen);
+
   json_node_free (root);
 
   return data;
diff -Nru json-glib-0.7.6/json-glib/json-gobject.h json-glib-0.10.2/json-glib/json-gobject.h
--- json-glib-0.7.6/json-glib/json-gobject.h	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-gobject.h	2009-11-28 19:13:00.000000000 +0000
@@ -69,23 +69,85 @@
 
 GType     json_serializable_get_type (void) G_GNUC_CONST;
 
-JsonNode *json_serializable_serialize_property   (JsonSerializable *serializable,
-                                                  const gchar      *property_name,
-                                                  const GValue     *value,
-                                                  GParamSpec       *pspec);
-gboolean  json_serializable_deserialize_property (JsonSerializable *serializable,
-                                                  const gchar      *property_name,
-                                                  GValue           *value,
-                                                  GParamSpec       *pspec,
-                                                  JsonNode         *property_node);
-
-
-GObject *json_construct_gobject (GType         gtype,
-                                 const gchar  *data,
-                                 gsize         length,
-                                 GError      **error);
-gchar *  json_serialize_gobject (GObject      *gobject,
-                                 gsize        *length) G_GNUC_MALLOC;
+JsonNode *json_serializable_serialize_property           (JsonSerializable *serializable,
+                                                          const gchar      *property_name,
+                                                          const GValue     *value,
+                                                          GParamSpec       *pspec);
+gboolean  json_serializable_deserialize_property         (JsonSerializable *serializable,
+                                                          const gchar      *property_name,
+                                                          GValue           *value,
+                                                          GParamSpec       *pspec,
+                                                          JsonNode         *property_node);
+
+JsonNode *json_serializable_default_serialize_property   (JsonSerializable *serializable,
+                                                          const gchar      *property_name,
+                                                          const GValue     *value,
+                                                          GParamSpec       *pspec);
+gboolean  json_serializable_default_deserialize_property (JsonSerializable *serializable,
+                                                          const gchar      *property_name,
+                                                          GValue           *value,
+                                                          GParamSpec       *pspec,
+                                                          JsonNode         *property_node);
+
+/**
+ * JsonBoxedSerializeFunc:
+ * @boxed: a #GBoxed
+ *
+ * Serializes the passed #GBoxed and stores it inside a #JsonNode
+ *
+ * Return value: the newly created #JsonNode
+ *
+ * Since: 0.10
+ */
+typedef JsonNode *(* JsonBoxedSerializeFunc) (gconstpointer boxed);
+
+/**
+ * JsonBoxedDeserializeFunc:
+ * @node: a #JsonNode
+ *
+ * Deserializes the contents of the passed #JsonNode into a #GBoxed
+ *
+ * Return value: the newly created boxed type
+ *
+ * Since: 0.10
+ */
+typedef gpointer (* JsonBoxedDeserializeFunc) (JsonNode *node);
+
+void      json_boxed_register_serialize_func   (GType                    gboxed_type,
+                                                JsonNodeType             node_type,
+                                                JsonBoxedSerializeFunc   serialize_func);
+void      json_boxed_register_deserialize_func (GType                    gboxed_type,
+                                                JsonNodeType             node_type,
+                                                JsonBoxedDeserializeFunc deserialize_func);
+gboolean  json_boxed_can_serialize             (GType                    gboxed_type,
+                                                JsonNodeType            *node_type);
+gboolean  json_boxed_can_deserialize           (GType                    gboxed_type,
+                                                JsonNodeType             node_type);
+JsonNode *json_boxed_serialize                 (GType                    gboxed_type,
+                                                gconstpointer            boxed);
+gpointer  json_boxed_deserialize               (GType                    gboxed_type,
+                                                JsonNode                *node);
+
+JsonNode *json_gobject_serialize               (GObject                 *gobject);
+GObject * json_gobject_deserialize             (GType                    gtype,
+                                                JsonNode                *node);
+
+GObject * json_gobject_from_data               (GType                    gtype,
+                                                const gchar             *data,
+                                                gssize                   length,
+                                                GError                 **error);
+gchar *   json_gobject_to_data                 (GObject                 *gobject,
+                                                gsize                   *length);
+
+#ifndef JSON_DISABLE_DEPRECATED
+GObject * json_construct_gobject               (GType                    gtype,
+                                                const gchar             *data,
+                                                gsize                    length,
+                                                GError                 **error) G_GNUC_DEPRECATED;
+gchar *   json_serialize_gobject               (GObject                 *gobject,
+                                                gsize                   *length) G_GNUC_MALLOC G_GNUC_DEPRECATED;
+#endif /* JSON_DISABLE_DEPRECATED */
+
 
 G_END_DECLS
 
diff -Nru json-glib-0.7.6/json-glib/json-gobject-private.h json-glib-0.10.2/json-glib/json-gobject-private.h
--- json-glib-0.7.6/json-glib/json-gobject-private.h	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-gobject-private.h	2009-10-29 14:37:07.000000000 +0000
@@ -0,0 +1,39 @@
+/* json-gobject-private.h - GObject private
+ * 
+ * This file is part of JSON-GLib
+ * Copyright (C) 2007  OpenedHand Ltd
+ * Copyright (C) 2009  Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Emmanuele Bassi  <ebassi@linux.intel.com>
+ */
+
+#ifndef __JSON_GOBJECT_PRIVATE_H__
+#define __JSON_GOBJECT_PRIVATE_H__
+
+#include "json-gobject.h"
+
+G_BEGIN_DECLS
+
+JsonNode *json_serialize_pspec   (const GValue *real_value,
+                                  GParamSpec   *pspec);
+gboolean  json_deserialize_pspec (GValue       *value,
+                                  GParamSpec   *pspec,
+                                  JsonNode     *node);
+
+G_END_DECLS
+
+#endif /* __JSON_GOBJECT_PRIVATE_H__ */
diff -Nru json-glib-0.7.6/json-glib/json-node.c json-glib-0.10.2/json-glib/json-node.c
--- json-glib-0.7.6/json-glib/json-node.c	2009-08-12 12:07:44.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-node.c	2010-01-04 18:06:17.000000000 +0000
@@ -125,7 +125,7 @@
  * Copies @node. If the node contains complex data types then the reference
  * count of the objects is increased.
  *
- * Return value: the copied #JsonNode
+ * Return value: (transfer full): the copied #JsonNode
  */
 JsonNode *
 json_node_copy (JsonNode *node)
@@ -220,7 +220,7 @@
  *
  * Retrieves the #JsonObject stored inside a #JsonNode
  *
- * Return value: the #JsonObject
+ * Return value: (transfer none): the #JsonObject
  */
 JsonObject *
 json_node_get_object (JsonNode *node)
@@ -238,7 +238,7 @@
  * Retrieves the #JsonObject inside @node. The reference count of
  * the returned object is increased.
  *
- * Return value: the #JsonObject
+ * Return value: (transfer full): the #JsonObject
  */
 JsonObject *
 json_node_dup_object (JsonNode *node)
@@ -305,7 +305,7 @@
  *
  * Retrieves the #JsonArray stored inside a #JsonNode
  *
- * Return value: the #JsonArray
+ * Return value: (transfer none): the #JsonArray
  */
 JsonArray *
 json_node_get_array (JsonNode *node)
@@ -323,7 +323,8 @@
  * Retrieves the #JsonArray stored inside a #JsonNode and returns it
  * with its reference count increased by one.
  *
- * Return value: the #JsonArray with its reference count increased.
+ * Return value: (transfer full): the #JsonArray with its reference
+ *   count increased.
  */
 JsonArray *
 json_node_dup_array (JsonNode *node)
@@ -469,6 +470,23 @@
   switch (node->type)
     {
     case JSON_NODE_OBJECT:
+    case JSON_NODE_ARRAY:
+    case JSON_NODE_NULL:
+      return json_node_type_get_name (node->type);
+
+    case JSON_NODE_VALUE:
+      return g_type_name (G_VALUE_TYPE (&(node->data.value)));
+    }
+
+  return "unknown";
+}
+
+G_CONST_RETURN gchar *
+json_node_type_get_name (JsonNodeType node_type)
+{
+  switch (node_type)
+    {
+    case JSON_NODE_OBJECT:
       return "JsonObject";
 
     case JSON_NODE_ARRAY:
@@ -478,13 +496,35 @@
       return "NULL";
 
     case JSON_NODE_VALUE:
-      return g_type_name (G_VALUE_TYPE (&(node->data.value)));
+      return "Value";
+
+    default:
+      g_assert_not_reached ();
+      break;
     }
 
   return "unknown";
 }
 
 /**
+ * json_node_set_parent:
+ * @node: a #JsonNode
+ * @parent: the parent #JsonNode of @node
+ *
+ * Sets the parent #JsonNode of @node
+ *
+ * Since: 0.8
+ */
+void
+json_node_set_parent (JsonNode *node,
+                      JsonNode *parent)
+{
+  g_return_if_fail (node != NULL);
+
+  node->parent = parent;
+}
+
+/**
  * json_node_get_parent:
  * @node: a #JsonNode
  *
@@ -558,8 +598,8 @@
  *
  * Gets a copy of the string value stored inside a #JsonNode
  *
- * Return value: a newly allocated string containing a copy of
- *   the #JsonNode contents
+ * Return value: (transfer full): a newly allocated string containing a copy
+ *   of the #JsonNode contents. Use g_free() to free the allocated resources
  */
 gchar *
 json_node_dup_string (JsonNode *node)
diff -Nru json-glib-0.7.6/json-glib/json-object.c json-glib-0.10.2/json-glib/json-object.c
--- json-glib-0.7.6/json-glib/json-object.c	2009-08-12 12:27:49.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-object.c	2010-01-10 10:49:26.000000000 +0000
@@ -35,11 +35,7 @@
  *
  * #JsonArray is the representation of the object type inside JSON. It contains
  * #JsonNode<!-- -->s, which may contain fundamental types, arrays or other
- * objects. Each member of an object is accessed using its name. Please note
- * that the member names are normalized internally before being used; every
- * delimiter matching the %G_STR_DELIMITER macro will be transformed into an
- * underscore, so for instance "member-name" and "member_name" are equivalent
- * for a #JsonObject.
+ * objects. Each member of an object is accessed using its name.
  *
  * Since objects can be expensive, they are reference counted. You can control
  * the lifetime of a #JsonObject using json_object_ref() and json_object_unref().
@@ -82,6 +78,7 @@
   object->members = g_hash_table_new_full (g_str_hash, g_str_equal,
                                            g_free,
                                            (GDestroyNotify) json_node_free);
+  object->members_ordered = NULL;
 
   return object;
 }
@@ -127,7 +124,9 @@
     g_atomic_int_compare_and_exchange (&object->ref_count, old_ref, old_ref - 1);
   else
     {
+      g_list_free (object->members_ordered);
       g_hash_table_destroy (object->members);
+      object->members_ordered = NULL;
       object->members = NULL;
 
       g_slice_free (JsonObject, object);
@@ -139,9 +138,12 @@
                             const gchar *member_name,
                             JsonNode    *node)
 {
-  g_hash_table_replace (object->members,
-                        g_strdup (member_name),
-                        node);
+  gchar *name = g_strdup (member_name);
+
+  if (g_hash_table_lookup (object->members, name) == NULL)
+    object->members_ordered = g_list_prepend (object->members_ordered, name);
+
+  g_hash_table_replace (object->members, name, node);
 }
 
 /**
@@ -401,53 +403,6 @@
   object_set_member_internal (object, member_name, node);
 }
 
-/* FIXME: yuck */
-#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 14
-static void
-get_keys (gpointer key,
-          gpointer value,
-          gpointer user_data)
-{
-  GList **keys = user_data;
-
-  *keys = g_list_prepend (*keys, key);
-}
-
-static void
-get_values (gpointer key,
-            gpointer value,
-            gpointer user_data)
-{
-  GList **values = user_data;
-
-  *values = g_list_prepend (*values, value);
-}
-
-static GList *
-g_hash_table_get_keys (GHashTable *hash_table)
-{
-  GList *retval = NULL;
-
-  g_return_val_if_fail (hash_table != NULL, NULL);
-
-  g_hash_table_foreach (hash_table, get_keys, &retval);
-
-  return retval;
-}
-
-static GList *
-g_hash_table_get_values (GHashTable *hash_table)
-{
-  GList *retval = NULL;
-
-  g_return_val_if_fail (hash_table != NULL, NULL);
-
-  g_hash_table_foreach (hash_table, get_values, &retval);
-
-  return retval;
-}
-#endif /* GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 14 */
-
 /**
  * json_object_get_members:
  * @object: a #JsonObject
@@ -455,17 +410,22 @@
  * Retrieves all the names of the members of a #JsonObject. You can
  * obtain the value for each member using json_object_get_member().
  *
- * Return value: a #GList of member names. The content of the list
- *   is owned by the #JsonObject and should never be modified or
- *   freed. When you have finished using the returned list, use
- *   g_list_free() to free the resources it has allocated.
+ * Return value: (element-type utf8) (transfer container): a #GList
+ *   of member names. The content of the list is owned by the #JsonObject
+ *   and should never be modified or freed. When you have finished using
+ *   the returned list, use g_list_free() to free the resources it has
+ *   allocated.
  */
 GList *
 json_object_get_members (JsonObject *object)
 {
+  GList *copy;
+
   g_return_val_if_fail (object != NULL, NULL);
 
-  return g_hash_table_get_keys (object->members);
+  copy = g_list_copy (object->members_ordered);
+
+  return g_list_reverse (copy);
 }
 
 /**
@@ -474,17 +434,23 @@
  *
  * Retrieves all the values of the members of a #JsonObject.
  *
- * Return value: a #GList of #JsonNode<!-- -->s. The content of the
- *   list is owned by the #JsonObject and should never be modified
- *   or freed. When you have finished using the returned list, use
- *   g_list_free() to free the resources it has allocated.
+ * Return value: (element-type JsonNode) (transfer container): a #GList of
+ *   #JsonNode<!-- -->s. The content of the list is owned by the #JsonObject
+ *   and should never be modified or freed. When you have finished using the
+ *   returned list, use g_list_free() to free the resources it has allocated.
  */
 GList *
 json_object_get_values (JsonObject *object)
 {
+  GList *values, *l;
+
   g_return_val_if_fail (object != NULL, NULL);
 
-  return g_hash_table_get_values (object->members);
+  values = NULL;
+  for (l = object->members_ordered; l != NULL; l = l->next)
+    values = g_list_prepend (values, g_hash_table_lookup (object->members, l->data));
+
+  return values;
 }
 
 /**
@@ -495,8 +461,8 @@
  * Retrieves a copy of the #JsonNode containing the value of @member_name
  * inside a #JsonObject
  *
- * Return value: a copy of the node for the requested object member
- *   or %NULL. Use json_node_free() when done.
+ * Return value: (transfer full) a copy of the node for the requested
+ *   object member or %NULL. Use json_node_free() when done.
  *
  * Since: 0.6
  */
@@ -703,7 +669,7 @@
  *
  * See also: json_object_get_member()
  *
- * Return value: the array inside the object's member
+ * Return value: (transfer none): the array inside the object's member
  *
  * Since: 0.8
  */
@@ -733,7 +699,7 @@
  *
  * See also: json_object_get_member()
  *
- * Return value: the object inside the object's member
+ * Return value: (transfer none): the object inside the object's member
  *
  * Since: 0.8
  */
@@ -799,32 +765,23 @@
 json_object_remove_member (JsonObject  *object,
                            const gchar *member_name)
 {
+  GList *l;
+
   g_return_if_fail (object != NULL);
   g_return_if_fail (member_name != NULL);
 
-  g_hash_table_remove (object->members, member_name);
-}
-
-typedef struct _ForeachClosure  ForeachClosure;
-
-struct _ForeachClosure
-{
-  JsonObject *object;
+  for (l = object->members_ordered; l != NULL; l = l->next)
+    {
+      const gchar *name = l->data;
 
-  JsonObjectForeach func;
-  gpointer data;
-};
-
-static void
-json_object_foreach_internal (gpointer key,
-                              gpointer value,
-                              gpointer data)
-{
-  ForeachClosure *clos = data;
-  const gchar *member_name = key;
-  JsonNode *member_node = value;
+      if (g_strcmp0 (name, member_name) == 0)
+        {
+          object->members_ordered = g_list_delete_link (object->members_ordered, l);
+          break;
+        }
+    }
 
-  clos->func (clos->object, member_name, member_node, clos->data);
+  g_hash_table_remove (object->members, member_name);
 }
 
 /**
@@ -847,15 +804,18 @@
                             JsonObjectForeach  func,
                             gpointer           data)
 {
-  ForeachClosure clos;
+  GList *members, *l;
 
   g_return_if_fail (object != NULL);
   g_return_if_fail (func != NULL);
 
-  clos.object = object;
-  clos.func = func;
-  clos.data = data;
-  g_hash_table_foreach (object->members,
-                        json_object_foreach_internal,
-                        &clos);
+  /* the list is stored in reverse order to have constant time additions */
+  members = g_list_last (object->members_ordered);
+  for (l = members; l != NULL; l = l->prev)
+    {
+      const gchar *member_name = l->data;
+      JsonNode *member_node = g_hash_table_lookup (object->members, member_name);
+
+      func (object, member_name, member_node, data);
+    }
 }
diff -Nru json-glib-0.7.6/json-glib/json-parser.c json-glib-0.10.2/json-glib/json-parser.c
--- json-glib-0.7.6/json-glib/json-parser.c	2009-08-12 15:48:08.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-parser.c	2010-01-04 17:39:23.000000000 +0000
@@ -59,11 +59,11 @@
 
   GError *last_error;
 
-  guint has_assignment : 1;
-  guint is_filename    : 1;
-
   gchar *variable_name;
   gchar *filename;
+
+  guint has_assignment : 1;
+  guint is_filename    : 1;
 };
 
 static const gchar symbol_names[] =
@@ -332,9 +332,80 @@
 }
 
 static guint
-json_parse_array (JsonParser *parser,
-                  JsonScanner   *scanner,
-                  gboolean    nested)
+json_parse_value (JsonParser   *parser,
+                  JsonScanner  *scanner,
+                  guint         token,
+                  JsonNode    **node)
+{
+  JsonNode *current_node = parser->priv->current_node;
+  gboolean is_negative = FALSE;
+
+  if (token == '-')
+    {
+      guint next_token = json_scanner_peek_next_token (scanner);
+
+      if (next_token == G_TOKEN_INT ||
+          next_token == G_TOKEN_FLOAT)
+        {
+           is_negative = TRUE;
+           token = json_scanner_get_next_token (scanner);
+        }
+      else
+        return G_TOKEN_INT;
+    }
+
+  switch (token)
+    {
+    case G_TOKEN_INT:
+      *node = json_node_new (JSON_NODE_VALUE);
+      json_node_set_int (*node, is_negative ? scanner->value.v_int64 * -1
+                                            : scanner->value.v_int64);
+      break;
+
+    case G_TOKEN_FLOAT:
+      *node = json_node_new (JSON_NODE_VALUE);
+      json_node_set_double (*node, 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_node_set_string (*node, scanner->value.v_string);
+      break;
+
+    case JSON_TOKEN_TRUE:
+    case JSON_TOKEN_FALSE:
+      *node = json_node_new (JSON_NODE_VALUE);
+      json_node_set_boolean (*node, token == JSON_TOKEN_TRUE ? TRUE : FALSE);
+      break;
+
+    case JSON_TOKEN_NULL:
+      *node = json_node_new (JSON_NODE_NULL);
+      break;
+
+    default:
+      {
+        JsonNodeType cur_type;
+
+        *node = NULL;
+
+        cur_type = json_node_get_node_type (current_node);
+        if (cur_type == JSON_NODE_ARRAY)
+          return G_TOKEN_RIGHT_BRACE;
+        else if (cur_type == JSON_NODE_OBJECT)
+          return G_TOKEN_RIGHT_CURLY;
+        else
+          return G_TOKEN_SYMBOL;
+      }
+    }
+
+  return G_TOKEN_NONE;
+}
+
+static guint
+json_parse_array (JsonParser  *parser,
+                  JsonScanner *scanner,
+                  gboolean     nested)
 {
   JsonParserPrivate *priv = parser->priv;
   JsonArray *array;
@@ -356,7 +427,6 @@
   while (token != G_TOKEN_RIGHT_BRACE)
     {
       JsonNode *node = NULL;
-      gboolean negative = FALSE;
 
       if (token == G_TOKEN_COMMA)
         {
@@ -387,7 +457,7 @@
             }
 
           json_array_add_element (array, node);
-          node->parent = priv->current_node;
+          json_node_set_parent (node, priv->current_node);
 
           g_signal_emit (parser, parser_signals[ARRAY_ELEMENT], 0,
                          array,
@@ -428,7 +498,7 @@
             }
 
           json_array_add_element (array, node);
-          node->parent = priv->current_node;
+          json_node_set_parent (node, priv->current_node);
 
           g_signal_emit (parser, parser_signals[ARRAY_ELEMENT], 0,
                          array,
@@ -448,67 +518,20 @@
           continue;
         }
 
-      if (token == '-')
+      /* value */
+      token = json_parse_value (parser, scanner, token, &node);
+      if (token != G_TOKEN_NONE || node == NULL)
         {
-          guint next_token = json_scanner_peek_next_token (scanner);
-
-          if (next_token == G_TOKEN_INT ||
-              next_token == G_TOKEN_FLOAT)
-            {
-              negative = TRUE;
-              token = json_scanner_get_next_token (scanner);
-            }
-          else
-            {
-              json_array_unref (array);
-
-              return G_TOKEN_INT;
-            }
-        }
-
-      switch (token)
-        {
-        case G_TOKEN_INT:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_int (node, negative ? scanner->value.v_int64 * -1
-                                            : scanner->value.v_int64);
-          break;
-
-        case G_TOKEN_FLOAT:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_double (node, negative ? scanner->value.v_float * -1.0
-                                               : scanner->value.v_float);
-          break;
-
-        case G_TOKEN_STRING:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_string (node, scanner->value.v_string);
-          break;
-
-        case JSON_TOKEN_TRUE:
-        case JSON_TOKEN_FALSE:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_boolean (node, token == JSON_TOKEN_TRUE ? TRUE : FALSE);
-          break;
-
-        case JSON_TOKEN_NULL:
-          node = json_node_new (JSON_NODE_NULL);
-          break;
-
-        default:
           json_array_unref (array);
-          return G_TOKEN_RIGHT_BRACE;
+          return token;
         }
 
-      if (node)
-        {
-          json_array_add_element (array, node);
-          node->parent = priv->current_node;
+      json_array_add_element (array, node);
+      json_node_set_parent (node, priv->current_node);
 
-          g_signal_emit (parser, parser_signals[ARRAY_ELEMENT], 0,
-                         array,
-                         json_array_get_length (array));
-        }
+      g_signal_emit (parser, parser_signals[ARRAY_ELEMENT], 0,
+                     array,
+                     json_array_get_length (array));
 
       token = json_scanner_get_next_token (scanner);
       if (token != G_TOKEN_COMMA && token != G_TOKEN_RIGHT_BRACE)
@@ -552,7 +575,6 @@
     {
       JsonNode *node = NULL;
       gchar *name = NULL;
-      gboolean negative = FALSE;
 
       if (token == G_TOKEN_COMMA)
         {
@@ -612,7 +634,7 @@
             }
 
           json_object_set_member (object, name, node);
-          node->parent = priv->current_node;
+          json_node_set_parent (node, priv->current_node);
 
           g_signal_emit (parser, parser_signals[OBJECT_MEMBER], 0,
                          object,
@@ -655,7 +677,7 @@
             }
 
           json_object_set_member (object, name, node);
-          node->parent = priv->current_node;
+          json_node_set_parent (node, priv->current_node);
           
           g_signal_emit (parser, parser_signals[OBJECT_MEMBER], 0,
                          object,
@@ -677,68 +699,21 @@
           continue;
         }
 
-      if (token == '-')
+      /* value */
+      token = json_parse_value (parser, scanner, token, &node);
+      if (token != G_TOKEN_NONE || node == NULL)
         {
-          guint next_token = json_scanner_peek_next_token (scanner);
-
-          if (next_token == G_TOKEN_INT || next_token == G_TOKEN_FLOAT)
-            {
-              negative = TRUE;
-              token = json_scanner_get_next_token (scanner);
-            }
-          else
-            {
-              g_free (name);
-              json_object_unref (object);
-
-              return G_TOKEN_INT;
-            }
-        }
-
-      switch (token)
-        {
-        case G_TOKEN_INT:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_int (node, negative ? scanner->value.v_int64 * -1
-                                            : scanner->value.v_int64);
-          break;
-
-        case G_TOKEN_FLOAT:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_double (node, negative ? scanner->value.v_float * -1.0
-                                               : scanner->value.v_float);
-          break;
-
-        case G_TOKEN_STRING:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_string (node, scanner->value.v_string);
-          break;
-
-        case JSON_TOKEN_TRUE:
-        case JSON_TOKEN_FALSE:
-          node = json_node_new (JSON_NODE_VALUE);
-          json_node_set_boolean (node, token == JSON_TOKEN_TRUE ? TRUE : FALSE);
-          break;
-
-        case JSON_TOKEN_NULL:
-          node = json_node_new (JSON_NODE_NULL);
-          break;
-
-        default:
-          g_free (name);
           json_object_unref (object);
-          return G_TOKEN_SYMBOL;
+          g_free (name);
+          return token;
         }
 
-      if (node)
-        {
-          json_object_set_member (object, name, node);
-          node->parent = priv->current_node;
-          
-          g_signal_emit (parser, parser_signals[OBJECT_MEMBER], 0,
-                         object,
-                         name);
-        }
+      json_object_set_member (object, name, node);
+      json_node_set_parent (node, priv->current_node);
+
+      g_signal_emit (parser, parser_signals[OBJECT_MEMBER], 0,
+                     object,
+                     name);
 
       g_free (name);
 
@@ -864,6 +839,7 @@
     case G_TOKEN_INT:
     case G_TOKEN_FLOAT:
     case G_TOKEN_STRING:
+      json_scanner_get_next_token (scanner);
       priv->root = priv->current_node = json_node_new (JSON_NODE_VALUE);
 
       if (token == G_TOKEN_INT)
@@ -884,8 +860,8 @@
 
 static void
 json_scanner_msg_handler (JsonScanner *scanner,
-                          gchar    *message,
-                          gboolean  is_error)
+                          gchar       *message,
+                          gboolean     is_error)
 {
   JsonParser *parser = scanner->user_data;
   JsonParserPrivate *priv = parser->priv;
@@ -1130,6 +1106,7 @@
 
   priv->is_filename = FALSE;
   g_free (priv->filename);
+  priv->filename = NULL;
 
   internal_error = NULL;
   if (!json_parser_load (parser, data, length, &internal_error))
@@ -1147,8 +1124,9 @@
  *
  * Retrieves the top level node from the parsed JSON stream.
  *
- * Return value: the root #JsonNode . The returned node is owned by
- *   the #JsonParser and should never be modified or freed.
+ * Return value: (transfer none): the root #JsonNode . The returned
+ *   node is owned by the #JsonParser and should never be modified
+ *   or freed.
  */
 JsonNode *
 json_parser_get_root (JsonParser *parser)
@@ -1208,7 +1186,8 @@
 /**
  * json_parser_has_assignment:
  * @parser: a #JsonParser
- * @variable_name: return location for the variable name, or %NULL
+ * @variable_name: (out) (allow-none): Return location for the variable
+ *   name, or %NULL
  *
  * A JSON data stream might sometimes contain an assignment, like:
  *
diff -Nru json-glib-0.7.6/json-glib/json-serializable.c json-glib-0.10.2/json-glib/json-serializable.c
--- json-glib-0.7.6/json-glib/json-serializable.c	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-serializable.c	2009-11-12 12:24:26.000000000 +0000
@@ -0,0 +1,249 @@
+/* json-gobject.c - JSON GObject integration
+ * 
+ * This file is part of JSON-GLib
+ * Copyright (C) 2007  OpenedHand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Author:
+ *   Emmanuele Bassi  <ebassi@openedhand.com>
+ */
+
+/**
+ * SECTION:json-serializable
+ * @short_description: Interface for serialize and deserialize special GObjects
+ *
+ * #JsonSerializable is an interface for #GObject classes that
+ * allows controlling how the class is going to be serialized
+ * or deserialized by json_construct_gobject() and
+ * json_serialize_gobject() respectively.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "json-types-private.h"
+#include "json-gobject-private.h"
+
+/**
+ * json_serializable_serialize_property:
+ * @serializable: a #JsonSerializable object
+ * @property_name: the name of the property
+ * @value: the value of the property
+ * @pspec: a #GParamSpec
+ *
+ * Asks a #JsonSerializable implementation to serialize a #GObject
+ * property into a #JsonNode object.
+ *
+ * Return value: a #JsonNode containing the serialized property
+ */
+JsonNode *
+json_serializable_serialize_property (JsonSerializable *serializable,
+                                      const gchar      *property_name,
+                                      const GValue     *value,
+                                      GParamSpec       *pspec)
+{
+  JsonSerializableIface *iface;
+
+  g_return_val_if_fail (JSON_IS_SERIALIZABLE (serializable), NULL);
+  g_return_val_if_fail (property_name != NULL, NULL);
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (pspec != NULL, NULL);
+
+  iface = JSON_SERIALIZABLE_GET_IFACE (serializable);
+
+  return iface->serialize_property (serializable, property_name, value, pspec);
+}
+
+/**
+ * json_serializable_deserialize_property:
+ * @serializable: a #JsonSerializable
+ * @property_name: the name of the property
+ * @value: a pointer to an uninitialized #GValue
+ * @pspec: a #GParamSpec
+ * @property_node: a #JsonNode containing the serialized property
+ *
+ * Asks a #JsonSerializable implementation to deserialize the
+ * property contained inside @property_node into @value.
+ *
+ * Return value: %TRUE if the property was successfully deserialized.
+ */
+gboolean
+json_serializable_deserialize_property (JsonSerializable *serializable,
+                                        const gchar      *property_name,
+                                        GValue           *value,
+                                        GParamSpec       *pspec,
+                                        JsonNode         *property_node)
+{
+  JsonSerializableIface *iface;
+
+  g_return_val_if_fail (JSON_IS_SERIALIZABLE (serializable), FALSE);
+  g_return_val_if_fail (property_name != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+  g_return_val_if_fail (pspec != NULL, FALSE);
+  g_return_val_if_fail (property_node != NULL, FALSE);
+
+  iface = JSON_SERIALIZABLE_GET_IFACE (serializable);
+
+  return iface->deserialize_property (serializable,
+                                      property_name,
+                                      value,
+                                      pspec,
+                                      property_node);
+}
+
+static gboolean
+json_serializable_real_deserialize (JsonSerializable *serializable,
+                                    const gchar      *name,
+                                    GValue           *value,
+                                    GParamSpec       *pspec,
+                                    JsonNode         *node)
+{
+  return json_deserialize_pspec (value, pspec, node);
+}
+
+static JsonNode *
+json_serializable_real_serialize (JsonSerializable *serializable,
+                                  const gchar      *name,
+                                  const GValue     *value,
+                                  GParamSpec       *pspec)
+{
+  return json_serialize_pspec (value, pspec);
+}
+
+static void
+json_serializable_base_init (gpointer g_class,
+                             gpointer data)
+{
+  static gboolean is_initialized = FALSE;
+
+  if (G_UNLIKELY (!is_initialized))
+    {
+      JsonSerializableIface *iface = g_class;
+
+      iface->serialize_property = json_serializable_real_serialize;
+      iface->deserialize_property = json_serializable_real_deserialize;
+
+      is_initialized = TRUE;
+    }
+}
+
+GType
+json_serializable_get_type (void)
+{
+  static GType iface_type = 0;
+
+  if (!iface_type)
+    iface_type =
+      g_type_register_static_simple (G_TYPE_INTERFACE,
+                                     g_intern_static_string ("JsonSerializable"),
+                                     sizeof (JsonSerializableIface),
+                                     json_serializable_base_init,
+                                     0, NULL, 0);
+
+  return iface_type;
+}
+
+/**
+ * json_serializable_default_serialize_property:
+ * @serializable: a #JsonSerializable object
+ * @property_name: the name of the property
+ * @value: the value of the property
+ * @pspec: a #GParamSpec
+ *
+ * Calls the default implementation of the #JsonSerializable
+ * serialize_property() virtual function
+ *
+ * This function can be used inside a custom implementation
+ * of the serialize_property() virtual function in lieu of:
+ *
+ * |[
+ *   JsonSerializable *iface;
+ *   JsonNode *node;
+ *
+ *   iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+ *   node = iface->serialize_property (serializable, property_name,
+ *                                     value,
+ *                                     pspec);
+ * ]|
+ *
+ * Return value: (transfer full): a #JsonNode containing the serialized
+ *   property
+ *
+ * Since: 0.10
+ */
+JsonNode *
+json_serializable_default_serialize_property (JsonSerializable *serializable,
+                                              const gchar      *property_name,
+                                              const GValue     *value,
+                                              GParamSpec       *pspec)
+{
+  g_return_val_if_fail (JSON_IS_SERIALIZABLE (serializable), NULL);
+  g_return_val_if_fail (property_name != NULL, NULL);
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (pspec != NULL, NULL);
+
+  return json_serializable_real_serialize (serializable,
+                                           property_name,
+                                           value, pspec);
+}
+
+/**
+ * json_serializable_default_deserialize_property:
+ * @serializable: a #JsonSerializable
+ * @property_name: the name of the property
+ * @value: a pointer to an uninitialized #GValue
+ * @pspec: a #GParamSpec
+ * @property_node: a #JsonNode containing the serialized property
+ *
+ * Calls the default implementation of the #JsonSerializable
+ * deserialize_property() virtual function
+ *
+ * This function can be used inside a custom implementation
+ * of the deserialize_property() virtual function in lieu of:
+ *
+ * |[
+ *   JsonSerializable *iface;
+ *   gboolean res;
+ *
+ *   iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+ *   res = iface->deserialize_property (serializable, property_name,
+ *                                      value,
+ *                                      pspec,
+ *                                      property_node);
+ * ]|
+ *
+ * Return value: %TRUE if the property was successfully deserialized.
+ *
+ * Since: 0.10
+ */
+gboolean
+json_serializable_default_deserialize_property (JsonSerializable *serializable,
+                                                const gchar      *property_name,
+                                                GValue           *value,
+                                                GParamSpec       *pspec,
+                                                JsonNode         *property_node)
+{
+  g_return_val_if_fail (JSON_IS_SERIALIZABLE (serializable), FALSE);
+  g_return_val_if_fail (property_name != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+  g_return_val_if_fail (pspec != NULL, FALSE);
+  g_return_val_if_fail (property_node != NULL, FALSE);
+
+  return json_serializable_real_deserialize (serializable,
+                                             property_name,
+                                             value, pspec,
+                                             property_node);
+}
diff -Nru json-glib-0.7.6/json-glib/json-types.h json-glib-0.10.2/json-glib/json-types.h
--- json-glib-0.7.6/json-glib/json-types.h	2009-08-12 13:33:15.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-types.h	2009-10-29 14:37:07.000000000 +0000
@@ -40,6 +40,57 @@
  */
 #define JSON_NODE_TYPE(node)    (json_node_get_node_type ((node)))
 
+/**
+ * JSON_NODE_HOLDS:
+ * @node: a #JsonNode
+ * @t: a #JsonNodeType
+ *
+ * Evaluates to %TRUE if the @node holds type @t
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS(node,t)         (json_node_get_node_type ((node)) == (t))
+
+/**
+ * JSON_NODE_HOLDS_VALUE:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_VALUE
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_VALUE(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_VALUE))
+
+/**
+ * JSON_NODE_HOLDS_OBJECT:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_OBJECT
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_OBJECT(node)    (JSON_NODE_HOLDS ((node), JSON_NODE_OBJECT))
+
+/**
+ * JSON_NODE_HOLDS_ARRAY:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_ARRAY
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_ARRAY(node)     (JSON_NODE_HOLDS ((node), JSON_NODE_ARRAY))
+
+/**
+ * JSON_NODE_HOLDS_NULL:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_NULL
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_NULL(node)      (JSON_NODE_HOLDS ((node), JSON_NODE_NULL))
+
 #define JSON_TYPE_NODE          (json_node_get_type ())
 #define JSON_TYPE_OBJECT        (json_object_get_type ())
 #define JSON_TYPE_ARRAY         (json_array_get_type ())
@@ -131,6 +182,8 @@
 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,
+                                                 JsonNode     *parent);
 JsonNode *            json_node_get_parent      (JsonNode     *node);
 G_CONST_RETURN gchar *json_node_type_name       (JsonNode     *node);
 
diff -Nru json-glib-0.7.6/json-glib/json-types-private.h json-glib-0.10.2/json-glib/json-types-private.h
--- json-glib-0.7.6/json-glib/json-types-private.h	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/json-glib/json-types-private.h	2009-10-29 14:37:07.000000000 +0000
@@ -53,9 +53,14 @@
 {
   GHashTable *members;
 
+  /* the members of the object, ordered in reverse */
+  GList *members_ordered;
+
   volatile gint ref_count;
 };
 
+G_CONST_RETURN gchar *json_node_type_get_name (JsonNodeType node_type);
+
 G_END_DECLS
 
 #endif /* __JSON_TYPES_PRIVATE_H__ */
diff -Nru json-glib-0.7.6/json-glib/Makefile.am json-glib-0.10.2/json-glib/Makefile.am
--- json-glib-0.7.6/json-glib/Makefile.am	2009-08-12 14:01:03.000000000 +0100
+++ json-glib-0.10.2/json-glib/Makefile.am	2010-02-26 13:56:30.000000000 +0000
@@ -1,8 +1,8 @@
-include $(top_srcdir)/Makefile.decl
-
-QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+include $(top_srcdir)/build/autotools/Makefile.am.gtest
+include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 if ENABLE_GLIB_TEST
+# build this directory *before* the tests/
 SUBDIRS = . tests
 endif
 
@@ -10,26 +10,24 @@
 
 NULL =
 
-INCLUDES = \
-	-I$(top_srcdir) 		\
+INCLUDES = -I$(top_srcdir)
+
+AM_CPPFLAGS = \
 	-DPREFIX=\""$(prefix)"\" 	\
 	-DLIBDIR=\""$(libdir)"\" 	\
 	-DJSON_COMPILATION=1		\
 	-DG_DISABLE_DEPRECATED 		\
+	-DJSON_DISABLE_DEPRECATED	\
 	-DG_LOG_DOMAIN=\"Json\" 	\
+	$(JSON_DEBUG_CFLAGS) 		\
 	$(NULL)
 
-LDADD = \
-	$(JSON_LT_LDFLAGS) \
-	-export-dynamic \
-	-export-symbols-regex "^json.*" \
-	-rpath $(libdir)
-
-AM_CPPFLAGS = $(JSON_CFLAGS) $(JSON_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
+AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
 
-BUILT_SOURCES = json-marshal.h json-marshal.c json-enum-types.h json-enum-types.c
+BUILT_SOURCES =
 
-STAMP_FILES = stamp-json-marshal.h stamp-json-enum-types.h
+CLEANFILES =
+DISTCLEANFILES = json-version.h
 
 source_h = \
 	$(top_srcdir)/json-glib/json-generator.h 	\
@@ -40,66 +38,38 @@
 
 source_h_private = \
 	$(top_srcdir)/json-glib/json-scanner.h 		\
+	$(top_srcdir)/json-glib/json-gobject-private.h	\
 	$(top_srcdir)/json-glib/json-types-private.h	\
 	$(NULL)
 
 source_c = \
 	$(srcdir)/json-array.c 		\
+	$(srcdir)/json-gboxed.c		\
 	$(srcdir)/json-generator.c 	\
 	$(srcdir)/json-gobject.c 	\
 	$(srcdir)/json-node.c 		\
 	$(srcdir)/json-object.c 	\
 	$(srcdir)/json-parser.c 	\
 	$(srcdir)/json-scanner.c 	\
+	$(srcdir)/json-serializable.c	\
 	$(NULL)
 
-json-marshal.h: stamp-json-marshal.h
-	@true
-stamp-json-marshal.h: Makefile json-marshal.list
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
-		--prefix=_json_marshal \
-		--header \
-	$(srcdir)/json-marshal.list > xgen-jmh \
-	&& (cmp -s xgen-jmh json-marshal.h || cp -f xgen-jmh json-marshal.h) \
-	&& rm -f xgen-jmh \
-	&& echo timestamp > $(@F)
-
-json-marshal.c: Makefile json-marshal.list
-	$(QUIET_GEN)(echo "#include \"json-marshal.h\"" ; \
-	  $(GLIB_GENMARSHAL) \
-		--prefix=_json_marshal \
-		--body \
-	  $(srcdir)/json-marshal.list ) > xgen-jmc \
-	&& cp -f xgen-jmc json-marshal.c \
-	&& rm -f xgen-jmc
-
-json-enum-types.h: stamp-json-enum-types.h
-	@true
-stamp-json-enum-types.h: $(source_h) Makefile
-	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(srcdir)/json-enum-types.h.in \
-	$(source_h) > xgen-ceth \
-	&& (cmp -s xgen-ceth json-enum-types.h || cp xgen-ceth json-enum-types.h) \
-	&& rm -f xgen-ceth \
-	&& echo timestamp > $(@F)
-
-json-enum-types.c: json-enum-types.h
-	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(srcdir)/json-enum-types.c.in \
-	$(source_h) > xgen-cetc \
-	&& cp xgen-cetc json-enum-types.c \
-	&& rm -f xgen-cetc
+# glib-mkenums rules
+glib_enum_h = json-enum-types.h
+glib_enum_c = json-enum-types.c
+glib_enum_headers = $(source_h)
+include $(top_srcdir)/build/autotools/Makefile.am.enums
+
+# glib-genmarshal rules
+glib_marshal_list = json-marshal.list
+glib_marshal_prefix = _json_marshal
+include $(top_srcdir)/build/autotools/Makefile.am.marshal
 
 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_priv) \
-	$(BUILT_SOURCES) \
-	$(NULL)
-libjson_glib_1_0_la_LDFLAGS = $(LDADD)
+libjson_glib_1_0_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
+libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
 
 jsonincludedir = $(includedir)/json-glib-1.0/json-glib
 jsoninclude_DATA = \
@@ -109,19 +79,7 @@
 	$(top_srcdir)/json-glib/json-glib.h		\
 	$(NULL)
 
-CLEANFILES = $(STAMP_FILES) $(BUILT_SOURCES)
-
-DISTCLEANFILES = json-version.h
-
-EXTRA_DIST += \
-	json-version.h.in 	\
-	json-types-private.h	\
-	json-scanner.h 		\
-	json-glib.h 		\
-	json-marshal.list 	\
-	json-enum-types.h.in 	\
-	json-enum-types.c.in	\
-	$(NULL)
+EXTRA_DIST += json-version.h.in json-glib.h
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" json_all_c_sources="$(source_c)"
 
@@ -129,12 +87,13 @@
 BUILT_GIRSOURCES =
 
 Json-1.0.gir: $(INTROSPECTION_SCANNER) libjson-glib-1.0.la
-	$(INTROSPECTION_SCANNER) \
+	$(QUIET_GEN)$(INTROSPECTION_SCANNER) \
 		-v --namespace Json --nsversion=1.0 \
 		$(INCLUDES) \
-		--c-include='json-glib/json-object.h' \
+		$(AM_CPPFLAGS) \
+		--c-include='json-glib/json-gobject.h' \
 		--include=GObject-2.0 \
-		--library=json-glib-1.0 \
+		--library=libjson-glib-1.0.la \
 		--libtool="$(top_builddir)/libtool" \
 		--pkg gobject-2.0 \
 		--output $@ \
@@ -152,7 +111,12 @@
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+	$(QUIET_GEN)\
+	$(DEBUG) $(INTROSPECTION_COMPILER) \
+		--includedir=$(srcdir) \
+		--includedir=. \
+		$(INTROSPECTION_COMPILER_OPTS) $< \
+		-o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
diff -Nru json-glib-0.7.6/json-glib/Makefile.in json-glib-0.10.2/json-glib/Makefile.in
--- json-glib-0.7.6/json-glib/Makefile.in	2009-08-12 16:07:33.000000000 +0100
+++ json-glib-0.10.2/json-glib/Makefile.in	2010-02-26 14:04:29.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -16,11 +17,47 @@
 
 # JSON-GLib - JSON reader and writer library
 
+# custom rules for quiet builds
+
+# Rules for generating enumeration types using glib-mkenums
+#
+# Define:
+# 	glib_enum_h = header template file
+# 	glib_enum_c = source template file
+# 	glib_enum_headers = list of headers to parse
+#
+# before including Makefile.am.enums. You will also need to have
+# the following targets already defined:
+#
+# 	CLEANFILES
+#	DISTCLEANFILES
+#	BUILT_SOURCES
+#	EXTRA_DIST
+#
+# Author: Emmanuele Bassi <ebassi@linux.intel.com>
+
+# Rules for generating marshal files using glib-genmarshal
+#
+# Define:
+# 	glib_marshal_list = marshal list file
+# 	glib_marshal_prefix = prefix for marshal functions
+#
+# before including Makefile.am.marshal. You will also need to have
+# the following targets already defined:
+#
+# 	CLEANFILES
+#	DISTCLEANFILES
+#	BUILT_SOURCES
+#	EXTRA_DIST
+#
+# Author: Emmanuele Bassi <ebassi@linux.intel.com>
+
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -36,7 +73,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/json-version.h.in $(top_srcdir)/Makefile.decl
+	$(srcdir)/json-version.h.in \
+	$(top_srcdir)/build/autotools/Makefile.am.enums \
+	$(top_srcdir)/build/autotools/Makefile.am.gtest \
+	$(top_srcdir)/build/autotools/Makefile.am.marshal \
+	$(top_srcdir)/build/autotools/Makefile.am.silent
 @HAVE_INTROSPECTION_TRUE@am__append_1 = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 subdir = json-glib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -49,49 +90,85 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = json-version.h
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
 	"$(DESTDIR)$(jsonincludedir)" "$(DESTDIR)$(typelibsdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libjson_glib_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 =
-am__objects_2 = json-array.lo json-generator.lo json-gobject.lo \
-	json-node.lo json-object.lo json-parser.lo json-scanner.lo \
-	$(am__objects_1)
+am__objects_2 = json-array.lo json-gboxed.lo json-generator.lo \
+	json-gobject.lo json-node.lo json-object.lo json-parser.lo \
+	json-scanner.lo json-serializable.lo $(am__objects_1)
 am__objects_3 = $(am__objects_1)
-am__objects_4 = json-marshal.lo json-enum-types.lo
+am__objects_4 = json-enum-types.lo
+am__objects_5 = json-marshal.lo
+am__objects_6 = $(am__objects_5)
+am__objects_7 = $(am__objects_1) $(am__objects_4) $(am__objects_3) \
+	$(am__objects_6)
 am_libjson_glib_1_0_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_1)
+	$(am__objects_3) $(am__objects_7)
 libjson_glib_1_0_la_OBJECTS = $(am_libjson_glib_1_0_la_OBJECTS)
-libjson_glib_1_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libjson_glib_1_0_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+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 $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libjson_glib_1_0_la_SOURCES)
 DIST_SOURCES = $(libjson_glib_1_0_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -101,18 +178,43 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-girDATA_INSTALL = $(INSTALL_DATA)
-jsonincludeDATA_INSTALL = $(INSTALL_DATA)
-typelibsDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(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
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -123,7 +225,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -134,8 +235,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -163,6 +262,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -172,12 +272,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -190,13 +289,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -244,7 +341,6 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -255,32 +351,41 @@
 GTESTER_REPORT = gtester-report
 
 # initialize variables for unconditional += appending
-EXTRA_DIST = json-version.h.in json-types-private.h json-scanner.h \
-	json-glib.h json-marshal.list json-enum-types.h.in \
-	json-enum-types.c.in $(NULL)
+EXTRA_DIST = $(srcdir)/$(enum_tmpl_h) $(srcdir)/$(enum_tmpl_c) \
+	$(srcdir)/$(glib_marshal_list) json-version.h.in json-glib.h
 TEST_PROGS = 
-QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+@USE_SHAVE_FALSE@QUIET_GEN = $(AM_V_GEN)
+@USE_SHAVE_TRUE@QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+@USE_SHAVE_FALSE@QUIET_LN = $(QUIET_LN_$(V))
+@USE_SHAVE_TRUE@QUIET_LN = $(Q:@=@echo '  LN    '$@;)
+@USE_SHAVE_FALSE@QUIET_RM = $(QUIET_RM_$(V))
+@USE_SHAVE_TRUE@QUIET_RM = $(Q:@=@echo '  RM    '$@;)
+@USE_SHAVE_FALSE@QUIET_LN_ = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_LN_0 = @echo '  LN     '$@;
+@USE_SHAVE_FALSE@QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_RM_0 = @echo '  RM     '$@;
+
+# build this directory *before* the tests/
 @ENABLE_GLIB_TEST_TRUE@SUBDIRS = . tests
 DIST_SUBDIRS = tests
 NULL = 
-INCLUDES = \
-	-I$(top_srcdir) 		\
+INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = \
 	-DPREFIX=\""$(prefix)"\" 	\
 	-DLIBDIR=\""$(libdir)"\" 	\
 	-DJSON_COMPILATION=1		\
 	-DG_DISABLE_DEPRECATED 		\
+	-DJSON_DISABLE_DEPRECATED	\
 	-DG_LOG_DOMAIN=\"Json\" 	\
+	$(JSON_DEBUG_CFLAGS) 		\
 	$(NULL)
 
-LDADD = \
-	$(JSON_LT_LDFLAGS) \
-	-export-dynamic \
-	-export-symbols-regex "^json.*" \
-	-rpath $(libdir)
-
-AM_CPPFLAGS = $(JSON_CFLAGS) $(JSON_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
-BUILT_SOURCES = json-marshal.h json-marshal.c json-enum-types.h json-enum-types.c
-STAMP_FILES = stamp-json-marshal.h stamp-json-enum-types.h
+AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
+BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \
+	$(marshal_c)
+CLEANFILES = stamp-enum-types stamp-marshal $(am__append_1)
+DISTCLEANFILES = json-version.h $(glib_enum_h) $(glib_enum_c) \
+	$(marshal_h) $(marshal_c)
 source_h = \
 	$(top_srcdir)/json-glib/json-generator.h 	\
 	$(top_srcdir)/json-glib/json-gobject.h 		\
@@ -290,29 +395,39 @@
 
 source_h_private = \
 	$(top_srcdir)/json-glib/json-scanner.h 		\
+	$(top_srcdir)/json-glib/json-gobject-private.h	\
 	$(top_srcdir)/json-glib/json-types-private.h	\
 	$(NULL)
 
 source_c = \
 	$(srcdir)/json-array.c 		\
+	$(srcdir)/json-gboxed.c		\
 	$(srcdir)/json-generator.c 	\
 	$(srcdir)/json-gobject.c 	\
 	$(srcdir)/json-node.c 		\
 	$(srcdir)/json-object.c 	\
 	$(srcdir)/json-parser.c 	\
 	$(srcdir)/json-scanner.c 	\
+	$(srcdir)/json-serializable.c	\
 	$(NULL)
 
+
+# glib-mkenums rules
+glib_enum_h = json-enum-types.h
+glib_enum_c = json-enum-types.c
+glib_enum_headers = $(source_h)
+enum_tmpl_h = $(glib_enum_h:.h=.h.in)
+enum_tmpl_c = $(glib_enum_c:.c=.c.in)
+
+# glib-genmarshal rules
+glib_marshal_list = json-marshal.list
+glib_marshal_prefix = _json_marshal
+marshal_h = $(glib_marshal_list:.list=.h)
+marshal_c = $(glib_marshal_list:.list=.c)
 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_priv) \
-	$(BUILT_SOURCES) \
-	$(NULL)
-
-libjson_glib_1_0_la_LDFLAGS = $(LDADD)
+libjson_glib_1_0_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
+libjson_glib_1_0_la_LDFLAGS = $(JSON_LT_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
 jsonincludedir = $(includedir)/json-glib-1.0/json-glib
 jsoninclude_DATA = \
 	$(source_h) 					\
@@ -321,8 +436,6 @@
 	$(top_srcdir)/json-glib/json-glib.h		\
 	$(NULL)
 
-CLEANFILES = $(STAMP_FILES) $(BUILT_SOURCES) $(am__append_1)
-DISTCLEANFILES = json-version.h
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" json_all_c_sources="$(source_c)"
 @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = Json-1.0.gir
 
@@ -337,7 +450,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.silent $(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 \
 	    *$$dep*) \
@@ -346,9 +459,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  json-glib/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  json-glib/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu json-glib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu json-glib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -366,25 +479,30 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 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)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  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)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -396,7 +514,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libjson-glib-1.0.la: $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_DEPENDENCIES) 
-	$(libjson_glib_1_0_la_LINK) -rpath $(libdir) $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libjson_glib_1_0_la_LINK) -rpath $(libdir) $(libjson_glib_1_0_la_OBJECTS) $(libjson_glib_1_0_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -406,6 +524,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-array.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-enum-types.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-gboxed.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-generator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-gobject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-marshal.Plo@am__quote@
@@ -413,76 +532,103 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-object.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-parser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-scanner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-serializable.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 json-array.lo: $(srcdir)/json-array.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-array.lo -MD -MP -MF $(DEPDIR)/json-array.Tpo -c -o json-array.lo `test -f '$(srcdir)/json-array.c' || echo '$(srcdir)/'`$(srcdir)/json-array.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/json-array.Tpo $(DEPDIR)/json-array.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-array.lo -MD -MP -MF $(DEPDIR)/json-array.Tpo -c -o json-array.lo `test -f '$(srcdir)/json-array.c' || echo '$(srcdir)/'`$(srcdir)/json-array.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-array.Tpo $(DEPDIR)/json-array.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-array.c' object='json-array.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-array.lo `test -f '$(srcdir)/json-array.c' || echo '$(srcdir)/'`$(srcdir)/json-array.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-array.lo `test -f '$(srcdir)/json-array.c' || echo '$(srcdir)/'`$(srcdir)/json-array.c
+
+json-gboxed.lo: $(srcdir)/json-gboxed.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-gboxed.lo -MD -MP -MF $(DEPDIR)/json-gboxed.Tpo -c -o json-gboxed.lo `test -f '$(srcdir)/json-gboxed.c' || echo '$(srcdir)/'`$(srcdir)/json-gboxed.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-gboxed.Tpo $(DEPDIR)/json-gboxed.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-gboxed.c' object='json-gboxed.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gboxed.lo `test -f '$(srcdir)/json-gboxed.c' || echo '$(srcdir)/'`$(srcdir)/json-gboxed.c
 
 json-generator.lo: $(srcdir)/json-generator.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-generator.lo -MD -MP -MF $(DEPDIR)/json-generator.Tpo -c -o json-generator.lo `test -f '$(srcdir)/json-generator.c' || echo '$(srcdir)/'`$(srcdir)/json-generator.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/json-generator.Tpo $(DEPDIR)/json-generator.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-generator.lo -MD -MP -MF $(DEPDIR)/json-generator.Tpo -c -o json-generator.lo `test -f '$(srcdir)/json-generator.c' || echo '$(srcdir)/'`$(srcdir)/json-generator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-generator.Tpo $(DEPDIR)/json-generator.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-generator.c' object='json-generator.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-generator.lo `test -f '$(srcdir)/json-generator.c' || echo '$(srcdir)/'`$(srcdir)/json-generator.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-generator.lo `test -f '$(srcdir)/json-generator.c' || echo '$(srcdir)/'`$(srcdir)/json-generator.c
 
 json-gobject.lo: $(srcdir)/json-gobject.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-gobject.lo -MD -MP -MF $(DEPDIR)/json-gobject.Tpo -c -o json-gobject.lo `test -f '$(srcdir)/json-gobject.c' || echo '$(srcdir)/'`$(srcdir)/json-gobject.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/json-gobject.Tpo $(DEPDIR)/json-gobject.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-gobject.lo -MD -MP -MF $(DEPDIR)/json-gobject.Tpo -c -o json-gobject.lo `test -f '$(srcdir)/json-gobject.c' || echo '$(srcdir)/'`$(srcdir)/json-gobject.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-gobject.Tpo $(DEPDIR)/json-gobject.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-gobject.c' object='json-gobject.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gobject.lo `test -f '$(srcdir)/json-gobject.c' || echo '$(srcdir)/'`$(srcdir)/json-gobject.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-gobject.lo `test -f '$(srcdir)/json-gobject.c' || echo '$(srcdir)/'`$(srcdir)/json-gobject.c
 
 json-node.lo: $(srcdir)/json-node.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-node.lo -MD -MP -MF $(DEPDIR)/json-node.Tpo -c -o json-node.lo `test -f '$(srcdir)/json-node.c' || echo '$(srcdir)/'`$(srcdir)/json-node.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/json-node.Tpo $(DEPDIR)/json-node.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-node.lo -MD -MP -MF $(DEPDIR)/json-node.Tpo -c -o json-node.lo `test -f '$(srcdir)/json-node.c' || echo '$(srcdir)/'`$(srcdir)/json-node.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-node.Tpo $(DEPDIR)/json-node.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-node.c' object='json-node.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-node.lo `test -f '$(srcdir)/json-node.c' || echo '$(srcdir)/'`$(srcdir)/json-node.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-node.lo `test -f '$(srcdir)/json-node.c' || echo '$(srcdir)/'`$(srcdir)/json-node.c
 
 json-object.lo: $(srcdir)/json-object.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-object.lo -MD -MP -MF $(DEPDIR)/json-object.Tpo -c -o json-object.lo `test -f '$(srcdir)/json-object.c' || echo '$(srcdir)/'`$(srcdir)/json-object.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/json-object.Tpo $(DEPDIR)/json-object.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-object.lo -MD -MP -MF $(DEPDIR)/json-object.Tpo -c -o json-object.lo `test -f '$(srcdir)/json-object.c' || echo '$(srcdir)/'`$(srcdir)/json-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-object.Tpo $(DEPDIR)/json-object.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-object.c' object='json-object.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-object.lo `test -f '$(srcdir)/json-object.c' || echo '$(srcdir)/'`$(srcdir)/json-object.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-object.lo `test -f '$(srcdir)/json-object.c' || echo '$(srcdir)/'`$(srcdir)/json-object.c
 
 json-parser.lo: $(srcdir)/json-parser.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-parser.lo -MD -MP -MF $(DEPDIR)/json-parser.Tpo -c -o json-parser.lo `test -f '$(srcdir)/json-parser.c' || echo '$(srcdir)/'`$(srcdir)/json-parser.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/json-parser.Tpo $(DEPDIR)/json-parser.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-parser.lo -MD -MP -MF $(DEPDIR)/json-parser.Tpo -c -o json-parser.lo `test -f '$(srcdir)/json-parser.c' || echo '$(srcdir)/'`$(srcdir)/json-parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-parser.Tpo $(DEPDIR)/json-parser.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-parser.c' object='json-parser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-parser.lo `test -f '$(srcdir)/json-parser.c' || echo '$(srcdir)/'`$(srcdir)/json-parser.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-parser.lo `test -f '$(srcdir)/json-parser.c' || echo '$(srcdir)/'`$(srcdir)/json-parser.c
 
 json-scanner.lo: $(srcdir)/json-scanner.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-scanner.lo -MD -MP -MF $(DEPDIR)/json-scanner.Tpo -c -o json-scanner.lo `test -f '$(srcdir)/json-scanner.c' || echo '$(srcdir)/'`$(srcdir)/json-scanner.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/json-scanner.Tpo $(DEPDIR)/json-scanner.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-scanner.lo -MD -MP -MF $(DEPDIR)/json-scanner.Tpo -c -o json-scanner.lo `test -f '$(srcdir)/json-scanner.c' || echo '$(srcdir)/'`$(srcdir)/json-scanner.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-scanner.Tpo $(DEPDIR)/json-scanner.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-scanner.c' object='json-scanner.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-scanner.lo `test -f '$(srcdir)/json-scanner.c' || echo '$(srcdir)/'`$(srcdir)/json-scanner.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-scanner.lo `test -f '$(srcdir)/json-scanner.c' || echo '$(srcdir)/'`$(srcdir)/json-scanner.c
+
+json-serializable.lo: $(srcdir)/json-serializable.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT json-serializable.lo -MD -MP -MF $(DEPDIR)/json-serializable.Tpo -c -o json-serializable.lo `test -f '$(srcdir)/json-serializable.c' || echo '$(srcdir)/'`$(srcdir)/json-serializable.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/json-serializable.Tpo $(DEPDIR)/json-serializable.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/json-serializable.c' object='json-serializable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o json-serializable.lo `test -f '$(srcdir)/json-serializable.c' || echo '$(srcdir)/'`$(srcdir)/json-serializable.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -492,54 +638,63 @@
 install-girDATA: $(gir_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
-	@list='$(gir_DATA)'; for p in $$list; do \
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(girDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(girdir)/$$f'"; \
-	  $(girDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(girdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \
 	done
 
 uninstall-girDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(gir_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(girdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(girdir)/$$f"; \
-	done
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(girdir)" && rm -f $$files
 install-jsonincludeDATA: $(jsoninclude_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(jsonincludedir)" || $(MKDIR_P) "$(DESTDIR)$(jsonincludedir)"
-	@list='$(jsoninclude_DATA)'; for p in $$list; do \
+	@list='$(jsoninclude_DATA)'; test -n "$(jsonincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(jsonincludeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(jsonincludedir)/$$f'"; \
-	  $(jsonincludeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(jsonincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsonincludedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(jsonincludedir)" || exit $$?; \
 	done
 
 uninstall-jsonincludeDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(jsoninclude_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(jsonincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(jsonincludedir)/$$f"; \
-	done
+	@list='$(jsoninclude_DATA)'; test -n "$(jsonincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(jsonincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(jsonincludedir)" && rm -f $$files
 install-typelibsDATA: $(typelibs_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)"
-	@list='$(typelibs_DATA)'; for p in $$list; do \
+	@list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(typelibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(typelibsdir)/$$f'"; \
-	  $(typelibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(typelibsdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibsdir)" || exit $$?; \
 	done
 
 uninstall-typelibsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(typelibs_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(typelibsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(typelibsdir)/$$f"; \
-	done
+	@list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(typelibsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(typelibsdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -548,7 +703,7 @@
 #     (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):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -565,7 +720,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -573,7 +728,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -599,16 +754,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -623,7 +778,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -635,7 +790,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -644,29 +799,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	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; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -687,29 +847,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -746,6 +921,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -769,6 +945,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -778,18 +956,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -813,8 +1001,9 @@
 uninstall-am: uninstall-girDATA uninstall-jsonincludeDATA \
 	uninstall-libLTLIBRARIES uninstall-typelibsDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	check-am ctags-recursive install 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 \
@@ -888,50 +1077,53 @@
 # run make test as part of make check
 check-local: test
 
-json-marshal.h: stamp-json-marshal.h
+stamp-enum-types: $(glib_enum_headers) $(srcdir)/$(enum_tmpl_h)
+	$(QUIET_GEN)$(GLIB_MKENUMS) \
+		--template $(srcdir)/$(enum_tmpl_h) \
+	$(glib_enum_headers) > xgen-eh \
+	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
+	&& rm -f xgen-eh \
+	&& echo timestamp > $(@F)
+
+$(glib_enum_h): stamp-enum-types
 	@true
-stamp-json-marshal.h: Makefile json-marshal.list
+
+$(glib_enum_c): $(glib_enum_h) $(srcdir)/$(enum_tmpl_c)
+	$(QUIET_GEN)$(GLIB_MKENUMS) \
+		--template $(srcdir)/$(enum_tmpl_c) \
+	$(glib_enum_headers) > xgen-ec \
+	&& cp -f xgen-ec $(glib_enum_c) \
+	&& rm -f xgen-ec
+
+stamp-marshal: $(glib_marshal_list)
 	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
-		--prefix=_json_marshal \
+		--prefix=$(glib_marshal_prefix) \
 		--header \
-	$(srcdir)/json-marshal.list > xgen-jmh \
-	&& (cmp -s xgen-jmh json-marshal.h || cp -f xgen-jmh json-marshal.h) \
-	&& rm -f xgen-jmh \
+	$(srcdir)/$(glib_marshal_list) > xgen-mh \
+	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
+	&& rm -f xgen-mh \
 	&& echo timestamp > $(@F)
 
-json-marshal.c: Makefile json-marshal.list
-	$(QUIET_GEN)(echo "#include \"json-marshal.h\"" ; \
-	  $(GLIB_GENMARSHAL) \
-		--prefix=_json_marshal \
-		--body \
-	  $(srcdir)/json-marshal.list ) > xgen-jmc \
-	&& cp -f xgen-jmc json-marshal.c \
-	&& rm -f xgen-jmc
-
-json-enum-types.h: stamp-json-enum-types.h
+$(marshal_h): stamp-marshal
 	@true
-stamp-json-enum-types.h: $(source_h) Makefile
-	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(srcdir)/json-enum-types.h.in \
-	$(source_h) > xgen-ceth \
-	&& (cmp -s xgen-ceth json-enum-types.h || cp xgen-ceth json-enum-types.h) \
-	&& rm -f xgen-ceth \
-	&& echo timestamp > $(@F)
 
-json-enum-types.c: json-enum-types.h
-	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(srcdir)/json-enum-types.c.in \
-	$(source_h) > xgen-cetc \
-	&& cp xgen-cetc json-enum-types.c \
-	&& rm -f xgen-cetc
+$(marshal_c): $(marshal_h)
+	$(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \
+	$(GLIB_GENMARSHAL) \
+		--prefix=$(glib_marshal_prefix) \
+		--body \
+	$(srcdir)/$(glib_marshal_list)) > xgen-mc \
+	&& cp xgen-mc $(marshal_c) \
+	&& rm -f xgen-mc
 
 @HAVE_INTROSPECTION_TRUE@Json-1.0.gir: $(INTROSPECTION_SCANNER) libjson-glib-1.0.la
-@HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_SCANNER) \
+@HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(INTROSPECTION_SCANNER) \
 @HAVE_INTROSPECTION_TRUE@		-v --namespace Json --nsversion=1.0 \
 @HAVE_INTROSPECTION_TRUE@		$(INCLUDES) \
-@HAVE_INTROSPECTION_TRUE@		--c-include='json-glib/json-object.h' \
+@HAVE_INTROSPECTION_TRUE@		$(AM_CPPFLAGS) \
+@HAVE_INTROSPECTION_TRUE@		--c-include='json-glib/json-gobject.h' \
 @HAVE_INTROSPECTION_TRUE@		--include=GObject-2.0 \
-@HAVE_INTROSPECTION_TRUE@		--library=json-glib-1.0 \
+@HAVE_INTROSPECTION_TRUE@		--library=libjson-glib-1.0.la \
 @HAVE_INTROSPECTION_TRUE@		--libtool="$(top_builddir)/libtool" \
 @HAVE_INTROSPECTION_TRUE@		--pkg gobject-2.0 \
 @HAVE_INTROSPECTION_TRUE@		--output $@ \
@@ -939,7 +1131,13 @@
 @HAVE_INTROSPECTION_TRUE@		$(source_c)
 
 @HAVE_INTROSPECTION_TRUE@%.typelib: %.gir $(INTROSPECTION_COMPILER)
-@HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+@HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)\
+@HAVE_INTROSPECTION_TRUE@	$(DEBUG) $(INTROSPECTION_COMPILER) \
+@HAVE_INTROSPECTION_TRUE@		--includedir=$(srcdir) \
+@HAVE_INTROSPECTION_TRUE@		--includedir=. \
+@HAVE_INTROSPECTION_TRUE@		$(INTROSPECTION_COMPILER_OPTS) $< \
+@HAVE_INTROSPECTION_TRUE@		-o $(@F)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/json-glib/tests/Makefile.am json-glib-0.10.2/json-glib/tests/Makefile.am
--- json-glib-0.7.6/json-glib/tests/Makefile.am	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/json-glib/tests/Makefile.am	2010-02-26 13:56:30.000000000 +0000
@@ -1,11 +1,15 @@
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/build/autotools/Makefile.am.gtest
+include $(top_srcdir)/build/autotools/Makefile.am.silent
+
+NULL =
 
 INCLUDES = \
-	-g				\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/json-glib	\
-	$(JSON_DEBUG_CFLAGS)		\
-	$(JSON_CFLAGS)
+	$(NULL)
+
+AM_CPPFLAGS = $(JSON_DEBUG_CFLAGS)
+AM_CFLAGS = -g $(JSON_CFLAGS)
 
 noinst_PROGRAMS = $(TEST_PROGS)
 progs_ldadd = $(top_builddir)/json-glib/libjson-glib-1.0.la
diff -Nru json-glib-0.7.6/json-glib/tests/Makefile.in json-glib-0.10.2/json-glib/tests/Makefile.in
--- json-glib-0.7.6/json-glib/tests/Makefile.in	2009-08-12 16:07:33.000000000 +0100
+++ json-glib-0.10.2/json-glib/tests/Makefile.in	2010-02-26 14:04:29.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -16,10 +17,13 @@
 
 # JSON-GLib - JSON reader and writer library
 
+# custom rules for quiet builds
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,7 +39,8 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.decl
+	$(top_srcdir)/build/autotools/Makefile.am.gtest \
+	$(top_srcdir)/build/autotools/Makefile.am.silent
 noinst_PROGRAMS = $(am__EXEEXT_1)
 subdir = json-glib/tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -48,19 +53,22 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = array-test$(EXEEXT) object-test$(EXEEXT) \
 	node-test$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am_array_test_OBJECTS = array-test.$(OBJEXT)
 array_test_OBJECTS = $(am_array_test_OBJECTS)
 array_test_DEPENDENCIES = $(progs_ldadd)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 am_node_test_OBJECTS = node-test.$(OBJEXT)
 node_test_OBJECTS = $(am_node_test_OBJECTS)
 node_test_DEPENDENCIES = $(progs_ldadd)
@@ -70,15 +78,29 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(array_test_SOURCES) $(node_test_SOURCES) \
 	$(object_test_SOURCES)
 DIST_SOURCES = $(array_test_SOURCES) $(node_test_SOURCES) \
@@ -88,7 +110,7 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -99,7 +121,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -110,8 +131,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -139,6 +158,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -148,12 +168,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -166,13 +185,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -220,7 +237,6 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -233,13 +249,24 @@
 # initialize variables for unconditional += appending
 EXTRA_DIST = 
 TEST_PROGS = array-test object-test node-test
+@USE_SHAVE_FALSE@QUIET_GEN = $(AM_V_GEN)
+@USE_SHAVE_TRUE@QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+@USE_SHAVE_FALSE@QUIET_LN = $(QUIET_LN_$(V))
+@USE_SHAVE_TRUE@QUIET_LN = $(Q:@=@echo '  LN    '$@;)
+@USE_SHAVE_FALSE@QUIET_RM = $(QUIET_RM_$(V))
+@USE_SHAVE_TRUE@QUIET_RM = $(Q:@=@echo '  RM    '$@;)
+@USE_SHAVE_FALSE@QUIET_LN_ = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_LN_0 = @echo '  LN     '$@;
+@USE_SHAVE_FALSE@QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_RM_0 = @echo '  RM     '$@;
+NULL = 
 INCLUDES = \
-	-g				\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/json-glib	\
-	$(JSON_DEBUG_CFLAGS)		\
-	$(JSON_CFLAGS)
+	$(NULL)
 
+AM_CPPFLAGS = $(JSON_DEBUG_CFLAGS)
+AM_CFLAGS = -g $(JSON_CFLAGS)
 progs_ldadd = $(top_builddir)/json-glib/libjson-glib-1.0.la
 array_test_SOURCES = array-test.c
 array_test_LDADD = $(progs_ldadd)
@@ -251,7 +278,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.silent $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -260,9 +287,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  json-glib/tests/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  json-glib/tests/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu json-glib/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu json-glib/tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -280,22 +307,25 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 array-test$(EXEEXT): $(array_test_OBJECTS) $(array_test_DEPENDENCIES) 
 	@rm -f array-test$(EXEEXT)
-	$(LINK) $(array_test_OBJECTS) $(array_test_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(array_test_OBJECTS) $(array_test_LDADD) $(LIBS)
 node-test$(EXEEXT): $(node_test_OBJECTS) $(node_test_DEPENDENCIES) 
 	@rm -f node-test$(EXEEXT)
-	$(LINK) $(node_test_OBJECTS) $(node_test_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(node_test_OBJECTS) $(node_test_LDADD) $(LIBS)
 object-test$(EXEEXT): $(object_test_OBJECTS) $(object_test_DEPENDENCIES) 
 	@rm -f object-test$(EXEEXT)
-	$(LINK) $(object_test_OBJECTS) $(object_test_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(object_test_OBJECTS) $(object_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -308,22 +338,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object-test.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -346,7 +379,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -354,29 +387,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	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; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -397,13 +435,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -432,6 +474,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -453,6 +496,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -461,18 +506,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -495,7 +550,7 @@
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.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 \
@@ -564,6 +619,7 @@
 .PHONY: test test-report perf-report full-report
 # run make test as part of make check
 check-local: test
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/json-glib/tests/node-test.c json-glib-0.10.2/json-glib/tests/node-test.c
--- json-glib-0.7.6/json-glib/tests/node-test.c	2009-08-12 13:44:39.000000000 +0100
+++ json-glib-0.10.2/json-glib/tests/node-test.c	2009-10-29 14:37:07.000000000 +0000
@@ -60,7 +60,7 @@
 {
   JsonNode *node = json_node_new (JSON_NODE_NULL);
 
-  g_assert_cmpint (json_node_get_node_type (node), ==, JSON_NODE_NULL);
+  g_assert (JSON_NODE_HOLDS_NULL (node));
   g_assert_cmpint (json_node_get_value_type (node), ==, G_TYPE_INVALID);
   g_assert_cmpstr (json_node_type_name (node), ==, "NULL");
 
diff -Nru json-glib-0.7.6/json-glib/tests/object-test.c json-glib-0.10.2/json-glib/tests/object-test.c
--- json-glib-0.7.6/json-glib/tests/object-test.c	2009-08-12 13:44:27.000000000 +0100
+++ json-glib-0.10.2/json-glib/tests/object-test.c	2009-10-29 14:05:33.000000000 +0000
@@ -103,6 +103,18 @@
   json_object_unref (object);
 }
 
+static void
+test_empty_member (void)
+{
+  JsonObject *object = json_object_new ();
+
+  json_object_set_string_member (object, "string", "");
+  g_assert (json_object_has_member (object, "string"));
+  g_assert_cmpstr (json_object_get_string_member (object, "string"), ==, "");
+
+  json_object_unref (object);
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -114,6 +126,7 @@
   g_test_add_func ("/object/add-member", test_add_member);
   g_test_add_func ("/object/remove-member", test_remove_member);
   g_test_add_func ("/object/foreach-member", test_foreach_member);
+  g_test_add_func ("/object/empty-member", test_empty_member);
 
   return g_test_run ();
 }
diff -Nru json-glib-0.7.6/ltmain.sh json-glib-0.10.2/ltmain.sh
--- json-glib-0.7.6/ltmain.sh	2009-08-12 16:07:25.000000000 +0100
+++ json-glib-0.10.2/ltmain.sh	2010-02-26 14:04:21.000000000 +0000
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
+#       $progname:		(GNU libtool) 2.2.6b
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION=2.2.6b
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -5033,10 +5033,7 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5347,19 +5344,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-		esac
-	      fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -5896,7 +5893,6 @@
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
-	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
@@ -6210,9 +6206,6 @@
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
 	  esac
 	  ;;
 	no)
diff -Nru json-glib-0.7.6/Makefile.am json-glib-0.10.2/Makefile.am
--- json-glib-0.7.6/Makefile.am	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/Makefile.am	2010-02-26 13:56:30.000000000 +0000
@@ -1,4 +1,5 @@
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/build/autotools/Makefile.am.gtest
+include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 ACLOCAL_AMFLAGS = -I build/autotools
 
@@ -13,7 +14,7 @@
 pcfiles = json-glib-1.0.pc
 
 json-glib-1.0.pc: json-glib.pc
-	@cp -f $< $@
+	$(QUIET_GEN)cp -f $< $@
 
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
@@ -22,7 +23,7 @@
 
 CLEANFILES = $(pcfiles) test-report.xml
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-introspection
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; then \
diff -Nru json-glib-0.7.6/Makefile.decl json-glib-0.10.2/Makefile.decl
--- json-glib-0.7.6/Makefile.decl	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/Makefile.decl	1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-# JSON-GLib - JSON reader and writer library
-
-GTESTER        = gtester
-GTESTER_REPORT = gtester-report
-
-# initialize variables for unconditional += appending
-EXTRA_DIST =
-TEST_PROGS =
-
-### testing rules
-
-# test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-	@ for subdir in $(SUBDIRS) . ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then	\
-	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	  elif test -n "${TEST_PROGS}" ; then \
-	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	  fi ; \
-	}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  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 ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
-check-local: test
diff -Nru json-glib-0.7.6/Makefile.in json-glib-0.10.2/Makefile.in
--- json-glib-0.7.6/Makefile.in	2009-08-12 16:07:33.000000000 +0100
+++ json-glib-0.10.2/Makefile.in	2010-02-26 14:04:30.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -16,10 +17,13 @@
 
 # JSON-GLib - JSON reader and writer library
 
+# custom rules for quiet builds
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -36,9 +40,12 @@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/json-glib.pc.in $(top_srcdir)/Makefile.decl \
+	$(srcdir)/json-glib.pc.in \
+	$(top_srcdir)/build/autotools/Makefile.am.gtest \
+	$(top_srcdir)/build/autotools/Makefile.am.silent \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing
 @ENABLE_GLIB_TEST_TRUE@am__append_1 = tests
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -51,7 +58,6 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -60,6 +66,13 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = json-glib.pc
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -74,28 +87,70 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
 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
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -106,7 +161,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -117,8 +171,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -146,6 +198,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -155,12 +208,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -173,13 +225,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -227,7 +277,6 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -240,6 +289,16 @@
 # initialize variables for unconditional += appending
 EXTRA_DIST = json-glib.pc.in
 TEST_PROGS = 
+@USE_SHAVE_FALSE@QUIET_GEN = $(AM_V_GEN)
+@USE_SHAVE_TRUE@QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+@USE_SHAVE_FALSE@QUIET_LN = $(QUIET_LN_$(V))
+@USE_SHAVE_TRUE@QUIET_LN = $(Q:@=@echo '  LN    '$@;)
+@USE_SHAVE_FALSE@QUIET_RM = $(QUIET_RM_$(V))
+@USE_SHAVE_TRUE@QUIET_RM = $(Q:@=@echo '  RM    '$@;)
+@USE_SHAVE_FALSE@QUIET_LN_ = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_LN_0 = @echo '  LN     '$@;
+@USE_SHAVE_FALSE@QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_RM_0 = @echo '  RM     '$@;
 ACLOCAL_AMFLAGS = -I build/autotools
 SUBDIRS = build json-glib doc $(am__append_1)
 DIST_SUBDIRS = build json-glib doc tests
@@ -247,26 +306,26 @@
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 CLEANFILES = $(pcfiles) test-report.xml
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-introspection
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.silent $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -282,9 +341,10 @@
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -296,7 +356,7 @@
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -316,20 +376,23 @@
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
 	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -338,7 +401,7 @@
 #     (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):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -355,7 +418,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -363,7 +426,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -389,16 +452,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -413,7 +476,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -425,7 +488,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -434,36 +497,41 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	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; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -479,29 +547,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -509,11 +592,13 @@
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -526,6 +611,10 @@
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -549,15 +638,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -565,9 +656,11 @@
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -589,13 +682,15 @@
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__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'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -642,6 +737,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -662,6 +758,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -670,18 +768,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -704,25 +812,26 @@
 
 uninstall-am: uninstall-pkgconfigDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
+	ctags-recursive install-am install-strip tags-recursive
 
 .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-lzma dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-pkgconfigDATA \
-	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 uninstall-pkgconfigDATA
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkgconfigDATA 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 \
+	uninstall-pkgconfigDATA
 
 
 ### testing rules
@@ -779,7 +888,7 @@
 check-local: test
 
 json-glib-1.0.pc: json-glib.pc
-	@cp -f $< $@
+	$(QUIET_GEN)cp -f $< $@
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; then \
@@ -792,6 +901,7 @@
 	else \
 	  echo A git checkout is required to generate a ChangeLog >&2; \
 	fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/missing json-glib-0.10.2/missing
--- json-glib-0.7.6/missing	2009-08-12 16:07:32.000000000 +0100
+++ json-glib-0.10.2/missing	2010-02-26 14:04:29.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
 # 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
@@ -89,6 +87,9 @@
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+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 $?
     ;;
@@ -106,15 +107,22 @@
 
 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).
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
 case $1 in
-  lex|yacc)
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -138,7 +146,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -148,7 +156,7 @@
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -157,7 +165,7 @@
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -187,7 +195,7 @@
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -210,7 +218,7 @@
     fi
     ;;
 
-  bison|yacc)
+  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
@@ -240,7 +248,7 @@
     fi
     ;;
 
-  lex|flex)
+  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
@@ -263,7 +271,7 @@
     fi
     ;;
 
-  help2man)
+  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
@@ -277,11 +285,11 @@
     else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
+  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
@@ -310,7 +318,7 @@
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru json-glib-0.7.6/NEWS json-glib-0.10.2/NEWS
--- json-glib-0.7.6/NEWS	2009-08-12 14:01:55.000000000 +0100
+++ json-glib-0.10.2/NEWS	2010-02-26 14:03:09.000000000 +0000
@@ -1,3 +1,23 @@
+Overview of changes for 0.10.2
+==============================
+• Documentation fixes for GBoxed transformation functions
+• Zero all fields of JsonObject on creation
+
+Overview of changes for 0.10.0
+==============================
+• Fix generation of doubles [Cornelius Hald]
+• Add more units to the test suite
+• Add JsonNode macros for quick type checking
+• Guarantee insertion order when parsing and generating JSON Objects
+• Serialize GParamSpecObject properties
+• Add serialization and deserialization for GBoxed types
+• Add API for serializing GObjects to, and deserializing from, JsonNode
+• Build environment fixes
+• Documentation fixes
+• Generate correct introspection data
+• Make JsonSerializable in complete control of deserialization [Tristan Van
+  Berkom]
+
 Overview of changes for 0.8.0
 =============================
 * Remove the in-tree Vala bindings: they are part of Vala, now
@@ -20,6 +40,8 @@
   lack of integer size in the JSON specificiation
 * Disallow the inclusion of single header files: only json-glib,h
   and json-gobject.h can be included directly
+* Documentation fixes
+* Clean up and remove code duplication inside the Parser object
 
 Overview of changes for 0.6.0
 =============================
diff -Nru json-glib-0.7.6/README json-glib-0.10.2/README
--- json-glib-0.7.6/README	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/README	2010-02-26 14:03:41.000000000 +0000
@@ -19,16 +19,20 @@
 toolkit and by the GNOME project.
 
 For more information, see:
- * JSON: http://www.json.org
- * GLib and GObject: http://www.gtk.org
+  • JSON: http://www.json.org
+  • GLib and GObject: http://www.gtk.org
 
 REQUIREMENTS
 ------------
 In order to build JSON-GLib you will need:
 
-  * pkg-config
-  * gtk-doc >= 1.11
-  * GLib >= 2.16
+  • pkg-config
+  • gtk-doc >= 1.11
+  • GLib >= 2.16
+
+Optionally, JSON-GLib depends on:
+
+  • GObject-Introspection >= 0.6.4
 
 INSTALLATION
 -------------------------------------------------------------------------------
@@ -40,22 +44,31 @@
 
 BUGS
 -------------------------------------------------------------------------------
-
 If you find a bug in JSON-GLib, please create a Bugzilla entry here:
 
   http://bugzilla.openedhand.com/enter_bug.cgi?product=json-glib
 
 Attaching:
-- the version of JSON-GLib
-  - if it is a development version, the branch of the git repository
-- the JSON data that produced the bug (if any)
-- a small test case, if none of the test units exhibit the behaviour
-- in case of a segmentation fault, a full stack trace with debugging
-  symbols obtained through gdb is greatly appreaciated
 
-HACKING
+  • the version of JSON-GLib
+    ◦ if it is a development version, the branch of the git repository
+  • the JSON data that produced the bug (if any)
+  • a small test case, if none of the test units exhibit the behaviour
+  • in case of a segmentation fault, a full stack trace with debugging
+    symbols obtained through gdb is greatly appreaciated
+
+RELEASE NOTES
 -------------------------------------------------------------------------------
+• Prior to JSON-GLib 0.10, a JsonSerializable implementation could
+  automatically fall back to the default serialization code by simply
+  returning NULL from an overridden JsonSerializable::serialize_property()
+  virtual function. Since JSON-GLib 0.10 this is not possible any more. A
+  JsonSerializable is always expected to serialize and deserialize all
+  properties. JSON-GLib provides public API for the default implementation
+  in case the serialization code wants to fall back to that.
 
+HACKING
+-------------------------------------------------------------------------------
 JSON-GLib is developed mainly inside a GIT repository available at:
 
   http://git.gnome.org/cgit/json-glib
diff -Nru json-glib-0.7.6/tests/Makefile.am json-glib-0.10.2/tests/Makefile.am
--- json-glib-0.7.6/tests/Makefile.am	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/tests/Makefile.am	2010-02-26 13:56:30.000000000 +0000
@@ -1,19 +1,14 @@
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/build/autotools/Makefile.am.gtest
+include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-INCLUDES = -I$(top_srcdir) $(JSON_CFLAGS)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/json-glib
+AM_CPPFLAGS = -DJSON_DISABLE_DEPRECATED $(JSON_DEBUG_CFLAGS) $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
 progs_ldadd = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/json-glib \
-	$(JSON_DEBUG_CFLAGS)
-
-AM_CFLAGS = -g
-
 TESTS_ENVIRONMENT = srcdir=$(srcdir)
 
 TEST_PROGS          += test-parser
@@ -32,6 +27,10 @@
 test_serialize_complex_SOURCES  = test-serialize-complex.c
 test_serialize_complex_LDADD    = $(progs_ldadd)
 
+TEST_PROGS                   += test-serialize-boxed
+test_serialize_boxed_SOURCES  = test-serialize-boxed.c
+test_serialize_boxed_LDADD    = $(progs_ldadd)
+
 TEST_PROGS                  += test-serialize-full
 test_serialize_full_SOURCES  = test-serialize-full.c
 test_serialize_full_LDADD    = $(progs_ldadd)
diff -Nru json-glib-0.7.6/tests/Makefile.in json-glib-0.10.2/tests/Makefile.in
--- json-glib-0.7.6/tests/Makefile.in	2009-08-12 16:07:33.000000000 +0100
+++ json-glib-0.10.2/tests/Makefile.in	2010-02-26 14:04:29.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -16,10 +17,13 @@
 
 # JSON-GLib - JSON reader and writer library
 
+# custom rules for quiet builds
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,7 +39,8 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.decl
+	$(top_srcdir)/build/autotools/Makefile.am.gtest \
+	$(top_srcdir)/build/autotools/Makefile.am.silent
 noinst_PROGRAMS = $(am__EXEEXT_1)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -48,16 +53,16 @@
 	$(top_srcdir)/build/autotools/ltsugar.m4 \
 	$(top_srcdir)/build/autotools/ltversion.m4 \
 	$(top_srcdir)/build/autotools/lt~obsolete.m4 \
-	$(top_srcdir)/build/autotools/shave.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = test-parser$(EXEEXT) test-generator$(EXEEXT) \
 	test-serialize-simple$(EXEEXT) test-serialize-complex$(EXEEXT) \
-	test-serialize-full$(EXEEXT)
+	test-serialize-boxed$(EXEEXT) test-serialize-full$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am_test_generator_OBJECTS = test-generator.$(OBJEXT)
 test_generator_OBJECTS = $(am_test_generator_OBJECTS)
@@ -65,9 +70,15 @@
 am__DEPENDENCIES_2 = $(top_builddir)/json-glib/libjson-glib-1.0.la \
 	$(am__DEPENDENCIES_1)
 test_generator_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 am_test_parser_OBJECTS = test-parser.$(OBJEXT)
 test_parser_OBJECTS = $(am_test_parser_OBJECTS)
 test_parser_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_serialize_boxed_OBJECTS = test-serialize-boxed.$(OBJEXT)
+test_serialize_boxed_OBJECTS = $(am_test_serialize_boxed_OBJECTS)
+test_serialize_boxed_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_serialize_complex_OBJECTS = test-serialize-complex.$(OBJEXT)
 test_serialize_complex_OBJECTS = $(am_test_serialize_complex_OBJECTS)
 test_serialize_complex_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -80,20 +91,36 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+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_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(test_generator_SOURCES) $(test_parser_SOURCES) \
+	$(test_serialize_boxed_SOURCES) \
 	$(test_serialize_complex_SOURCES) \
 	$(test_serialize_full_SOURCES) \
 	$(test_serialize_simple_SOURCES)
 DIST_SOURCES = $(test_generator_SOURCES) $(test_parser_SOURCES) \
+	$(test_serialize_boxed_SOURCES) \
 	$(test_serialize_complex_SOURCES) \
 	$(test_serialize_full_SOURCES) \
 	$(test_serialize_simple_SOURCES)
@@ -102,7 +129,7 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -113,7 +140,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -124,8 +150,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -153,6 +177,7 @@
 JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@
 JSON_MICRO_VERSION = @JSON_MICRO_VERSION@
 JSON_MINOR_VERSION = @JSON_MINOR_VERSION@
+JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@
 JSON_VERSION = @JSON_VERSION@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -162,12 +187,11 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAKEFLAGS = @MAKEFLAGS@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
-OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -180,13 +204,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-V = @V@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -234,7 +256,6 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -247,16 +268,22 @@
 # initialize variables for unconditional += appending
 EXTRA_DIST = 
 TEST_PROGS = test-parser test-generator test-serialize-simple \
-	test-serialize-complex test-serialize-full
+	test-serialize-complex test-serialize-boxed \
+	test-serialize-full
+@USE_SHAVE_FALSE@QUIET_GEN = $(AM_V_GEN)
+@USE_SHAVE_TRUE@QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+@USE_SHAVE_FALSE@QUIET_LN = $(QUIET_LN_$(V))
+@USE_SHAVE_TRUE@QUIET_LN = $(Q:@=@echo '  LN    '$@;)
+@USE_SHAVE_FALSE@QUIET_RM = $(QUIET_RM_$(V))
+@USE_SHAVE_TRUE@QUIET_RM = $(Q:@=@echo '  RM    '$@;)
+@USE_SHAVE_FALSE@QUIET_LN_ = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_LN_0 = @echo '  LN     '$@;
+@USE_SHAVE_FALSE@QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
+@USE_SHAVE_FALSE@QUIET_RM_0 = @echo '  RM     '$@;
 NULL = 
-INCLUDES = -I$(top_srcdir) $(JSON_CFLAGS)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/json-glib
+AM_CPPFLAGS = -DJSON_DISABLE_DEPRECATED $(JSON_DEBUG_CFLAGS) $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
 progs_ldadd = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/json-glib \
-	$(JSON_DEBUG_CFLAGS)
-
-AM_CFLAGS = -g
 TESTS_ENVIRONMENT = srcdir=$(srcdir)
 test_parser_SOURCES = test-parser.c
 test_parser_LDADD = $(progs_ldadd)
@@ -266,13 +293,15 @@
 test_serialize_simple_LDADD = $(progs_ldadd)
 test_serialize_complex_SOURCES = test-serialize-complex.c
 test_serialize_complex_LDADD = $(progs_ldadd)
+test_serialize_boxed_SOURCES = test-serialize-boxed.c
+test_serialize_boxed_LDADD = $(progs_ldadd)
 test_serialize_full_SOURCES = test-serialize-full.c
 test_serialize_full_LDADD = $(progs_ldadd)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.gtest $(top_srcdir)/build/autotools/Makefile.am.silent $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -281,9 +310,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tests/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -301,28 +330,34 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 test-generator$(EXEEXT): $(test_generator_OBJECTS) $(test_generator_DEPENDENCIES) 
 	@rm -f test-generator$(EXEEXT)
-	$(LINK) $(test_generator_OBJECTS) $(test_generator_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_generator_OBJECTS) $(test_generator_LDADD) $(LIBS)
 test-parser$(EXEEXT): $(test_parser_OBJECTS) $(test_parser_DEPENDENCIES) 
 	@rm -f test-parser$(EXEEXT)
-	$(LINK) $(test_parser_OBJECTS) $(test_parser_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_parser_OBJECTS) $(test_parser_LDADD) $(LIBS)
+test-serialize-boxed$(EXEEXT): $(test_serialize_boxed_OBJECTS) $(test_serialize_boxed_DEPENDENCIES) 
+	@rm -f test-serialize-boxed$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_serialize_boxed_OBJECTS) $(test_serialize_boxed_LDADD) $(LIBS)
 test-serialize-complex$(EXEEXT): $(test_serialize_complex_OBJECTS) $(test_serialize_complex_DEPENDENCIES) 
 	@rm -f test-serialize-complex$(EXEEXT)
-	$(LINK) $(test_serialize_complex_OBJECTS) $(test_serialize_complex_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_serialize_complex_OBJECTS) $(test_serialize_complex_LDADD) $(LIBS)
 test-serialize-full$(EXEEXT): $(test_serialize_full_OBJECTS) $(test_serialize_full_DEPENDENCIES) 
 	@rm -f test-serialize-full$(EXEEXT)
-	$(LINK) $(test_serialize_full_OBJECTS) $(test_serialize_full_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_serialize_full_OBJECTS) $(test_serialize_full_LDADD) $(LIBS)
 test-serialize-simple$(EXEEXT): $(test_serialize_simple_OBJECTS) $(test_serialize_simple_DEPENDENCIES) 
 	@rm -f test-serialize-simple$(EXEEXT)
-	$(LINK) $(test_serialize_simple_OBJECTS) $(test_serialize_simple_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_serialize_simple_OBJECTS) $(test_serialize_simple_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -332,27 +367,31 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-generator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-serialize-boxed.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-serialize-complex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-serialize-full.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-serialize-simple.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -375,7 +414,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -383,29 +422,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	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; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -426,13 +470,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -461,6 +509,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -482,6 +531,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -490,18 +541,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -524,7 +585,7 @@
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.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 \
@@ -593,6 +654,7 @@
 .PHONY: test test-report perf-report full-report
 # run make test as part of make check
 check-local: test
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru json-glib-0.7.6/tests/test-generator.c json-glib-0.10.2/tests/test-generator.c
--- json-glib-0.7.6/tests/test-generator.c	2009-08-12 11:39:35.000000000 +0100
+++ json-glib-0.10.2/tests/test-generator.c	2010-02-26 13:56:30.000000000 +0000
@@ -125,7 +125,7 @@
 test_nested_array (void)
 {
   JsonGenerator *generator = json_generator_new ();
-  JsonNode *root, *val, *nested_val;
+  JsonNode *root, *val;
   JsonArray *array, *nested;
   GValue value = { 0, };
   gchar *data;
@@ -175,7 +175,7 @@
 test_simple_object (void)
 {
   JsonGenerator *generator = json_generator_new ();
-  JsonNode *root, *val;
+  JsonNode *root;
   JsonObject *object;
   gchar *data;
   gsize len;
@@ -196,11 +196,12 @@
   data = json_generator_to_data (generator, &len);
 
   if (g_test_verbose ())
-    g_print ("checking simple array `%s' (expected: %s)\n",
+    g_print ("checking simple object `%s' (expected: %s)\n",
              data,
              simple_object);
 
   g_assert_cmpint (len, ==, strlen (simple_object));
+  g_assert_cmpstr (data, ==, simple_object);
 
   /* we cannot compare the strings literal because JsonObject does not
    * guarantee any ordering
diff -Nru json-glib-0.7.6/tests/test-parser.c json-glib-0.10.2/tests/test-parser.c
--- json-glib-0.7.6/tests/test-parser.c	2009-08-12 11:38:58.000000000 +0100
+++ json-glib-0.10.2/tests/test-parser.c	2010-02-26 13:56:30.000000000 +0000
@@ -13,15 +13,41 @@
 static const gchar *test_empty_array_string = "[ ]";
 static const gchar *test_empty_object_string = "{ }";
 
+static void
+verify_int_value (JsonNode *node)
+{
+  g_assert_cmpint (42, ==, json_node_get_int (node));
+}
+
+static void
+verify_boolean_value (JsonNode *node)
+{
+  g_assert_cmpint (TRUE, ==, json_node_get_boolean (node));
+}
+
+static void
+verify_string_value (JsonNode *node)
+{
+  g_assert_cmpstr ("string", ==, json_node_get_string (node));
+}
+
+static void
+verify_double_value (JsonNode *node)
+{
+  g_assert_cmpfloat (10.2e3, ==, json_node_get_double (node));
+}
+
 static const struct {
   const gchar *str;
   JsonNodeType type;
   GType gtype;
+  void (* verify_value) (JsonNode *node);
 } test_base_values[] = {
-  { "null", JSON_NODE_NULL, G_TYPE_INVALID },
-  { "42", JSON_NODE_VALUE, G_TYPE_INT64 },
-  { "true", JSON_NODE_VALUE, G_TYPE_BOOLEAN },
-  { "\"string\"", JSON_NODE_VALUE, G_TYPE_STRING }
+  { "null",       JSON_NODE_NULL,  G_TYPE_INVALID, NULL, },
+  { "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 }
 };
 
 static const struct {
@@ -55,6 +81,7 @@
   GType gtype;
 } test_simple_objects[] = {
   { "{ \"test\" : 42 }", 1, "test", JSON_NODE_VALUE, G_TYPE_INT64 },
+  { "{ \"name\" : \"\", \"state\" : 1 }", 2, "name", JSON_NODE_VALUE, G_TYPE_STRING },
   { "{ \"foo\" : \"bar\", \"baz\" : null }", 2, "baz", JSON_NODE_NULL, G_TYPE_INVALID },
   { "{ \"channel\" : \"/meta/connect\" }", 1, "channel", JSON_NODE_VALUE, G_TYPE_STRING }
 };
@@ -153,6 +180,7 @@
 
           root = json_parser_get_root (parser);
           g_assert (root != NULL);
+          g_assert (json_node_get_parent (root) == NULL);
 
           if (g_test_verbose ())
             g_print ("checking root node is of the desired type %s...\n",
@@ -160,6 +188,9 @@
                                                                  : g_type_name (test_base_values[i].gtype));
           g_assert_cmpint (JSON_NODE_TYPE (root), ==, test_base_values[i].type);
           g_assert_cmpint (json_node_get_value_type (root), ==, test_base_values[i].gtype);
+
+          if (test_base_values[i].verify_value)
+            test_base_values[i].verify_value (root);
        }
     }
 
@@ -197,6 +228,7 @@
         g_print ("checking root node is an array...\n");
       root = json_parser_get_root (parser);
       g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_ARRAY);
+      g_assert (json_node_get_parent (root) == NULL);
 
       array = json_node_get_array (root);
       g_assert (array != NULL);
@@ -245,6 +277,7 @@
             g_print ("checking root node is an array...\n");
           root = json_parser_get_root (parser);
           g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_ARRAY);
+          g_assert (json_node_get_parent (root) == NULL);
 
           array = json_node_get_array (root);
           g_assert (array != NULL);
@@ -260,6 +293,7 @@
                      g_type_name (test_simple_arrays[i].gtype));
           node = json_array_get_element (array, test_simple_arrays[i].element);
           g_assert (node != NULL);
+          g_assert (json_node_get_parent (node) == root);
           g_assert_cmpint (JSON_NODE_TYPE (node), ==, test_simple_arrays[i].type);
           g_assert_cmpint (json_node_get_value_type (node), ==, test_simple_arrays[i].gtype);
         }
@@ -304,6 +338,7 @@
             g_print ("checking root node is an array...\n");
           root = json_parser_get_root (parser);
           g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_ARRAY);
+          g_assert (json_node_get_parent (root) == NULL);
 
           array = json_node_get_array (root);
           g_assert (array != NULL);
@@ -347,7 +382,9 @@
       if (g_test_verbose ())
         g_print ("checking root node is an object...\n");
       root = json_parser_get_root (parser);
+      g_assert (json_node_get_parent (root) == NULL);
       g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_OBJECT);
+      g_assert (json_node_get_parent (root) == NULL);
 
       object = json_node_get_object (root);
       g_assert (object != NULL);
@@ -396,6 +433,7 @@
             g_print ("checking root node is an object...\n");
           root = json_parser_get_root (parser);
           g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_OBJECT);
+          g_assert (json_node_get_parent (root) == NULL);
 
           object = json_node_get_object (root);
           g_assert (object != NULL);
@@ -411,6 +449,7 @@
                      g_type_name (test_simple_objects[i].gtype));
           node = json_object_get_member (object, test_simple_objects[i].member);
           g_assert (node != NULL);
+          g_assert (json_node_get_parent (node) == root);
           g_assert_cmpint (JSON_NODE_TYPE (node), ==, test_simple_objects[i].type);
           g_assert_cmpint (json_node_get_value_type (node), ==, test_simple_objects[i].gtype);
         }
@@ -455,6 +494,7 @@
             g_print ("checking root node is an object...\n");
           root = json_parser_get_root (parser);
           g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_OBJECT);
+          g_assert (json_node_get_parent (root) == NULL);
 
           object = json_node_get_object (root);
           g_assert (object != NULL);
diff -Nru json-glib-0.7.6/tests/test-serialize-boxed.c json-glib-0.10.2/tests/test-serialize-boxed.c
--- json-glib-0.7.6/tests/test-serialize-boxed.c	1970-01-01 01:00:00.000000000 +0100
+++ json-glib-0.10.2/tests/test-serialize-boxed.c	2009-11-13 17:17:42.000000000 +0000
@@ -0,0 +1,264 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <glib-object.h>
+
+#include <json-glib/json-glib.h>
+#include <json-glib/json-gobject.h>
+
+#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))
+#define TEST_IS_OBJECT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_OBJECT))
+#define TEST_OBJECT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_TYPE_OBJECT, TestObjectClass))
+#define TEST_IS_OBJECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_TYPE_OBJECT))
+#define TEST_OBJECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_TYPE_OBJECT, TestObjectClass))
+
+typedef struct _TestBoxed               TestBoxed;
+typedef struct _TestObject              TestObject;
+typedef struct _TestObjectClass         TestObjectClass;
+
+struct _TestBoxed
+{
+  gint foo;
+  gboolean bar;
+};
+
+struct _TestObject
+{
+  GObject parent_instance;
+
+  TestBoxed blah;
+};
+
+struct _TestObjectClass
+{
+  GObjectClass parent_class;
+};
+
+GType test_object_get_type (void);
+
+/*** implementation ***/
+
+static gpointer
+test_boxed_copy (gpointer src)
+{
+  return g_slice_dup (TestBoxed, src);
+}
+
+static void
+test_boxed_free (gpointer boxed)
+{
+  if (G_LIKELY (boxed != NULL))
+    g_slice_free (TestBoxed, boxed);
+}
+
+static JsonNode *
+test_boxed_serialize (gconstpointer boxed)
+{
+  const TestBoxed *test = boxed;
+  JsonObject *object;
+  JsonNode *node;
+
+  if (boxed == NULL)
+    return json_node_new (JSON_NODE_NULL);
+
+  object = json_object_new ();
+  node = json_node_new (JSON_NODE_OBJECT);
+
+  json_object_set_int_member (object, "foo", test->foo);
+  json_object_set_boolean_member (object, "bar", test->bar);
+
+  json_node_take_object (node, object);
+
+  if (g_test_verbose ())
+    {
+      g_print ("Serialize: { foo: %" G_GINT64_FORMAT ", bar: %s }\n",
+               json_object_get_int_member (object, "foo"),
+               json_object_get_boolean_member (object, "bar") ? "true" : "false");
+    }
+
+  return node;
+}
+
+static gpointer
+test_boxed_deserialize (JsonNode *node)
+{
+  JsonObject *object;
+  TestBoxed *test;
+
+  if (json_node_get_node_type (node) != JSON_NODE_OBJECT)
+    return NULL;
+
+  object = json_node_get_object (node);
+
+  test = g_slice_new (TestBoxed);
+  test->foo = json_object_get_int_member (object, "foo");
+  test->bar = json_object_get_boolean_member (object, "bar");
+
+  if (g_test_verbose ())
+    {
+      g_print ("Deserialize: { foo: %d, bar: %s }\n",
+               test->foo,
+               test->bar ? "true" : "false");
+    }
+
+  return test;
+}
+
+GType
+test_boxed_get_type (void)
+{
+  static GType b_type = 0;
+
+  if (G_UNLIKELY (b_type == 0))
+    {
+      b_type = g_boxed_type_register_static ("TestBoxed",
+                                             test_boxed_copy,
+                                             test_boxed_free);
+
+      if (g_test_verbose ())
+        g_print ("Registering transform functions\n");
+
+      json_boxed_register_serialize_func (b_type, JSON_NODE_OBJECT,
+                                          test_boxed_serialize);
+      json_boxed_register_deserialize_func (b_type, JSON_NODE_OBJECT,
+                                            test_boxed_deserialize);
+    }
+
+  return b_type;
+}
+
+enum
+{
+  PROP_0,
+
+  PROP_BLAH
+};
+
+G_DEFINE_TYPE (TestObject, test_object, G_TYPE_OBJECT);
+
+static void
+test_object_finalize (GObject *gobject)
+{
+  G_OBJECT_CLASS (test_object_parent_class)->finalize (gobject);
+}
+
+static void
+test_object_set_property (GObject      *gobject,
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  switch (prop_id)
+    {
+    case PROP_BLAH:
+      {
+        const TestBoxed *blah = g_value_get_boxed (value);
+
+        TEST_OBJECT (gobject)->blah = *blah;
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+    }
+}
+
+static void
+test_object_get_property (GObject    *gobject,
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  switch (prop_id)
+    {
+    case PROP_BLAH:
+      g_value_set_boxed (value, &(TEST_OBJECT (gobject)->blah));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+    }
+}
+
+static void
+test_object_class_init (TestObjectClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = test_object_set_property;
+  gobject_class->get_property = test_object_get_property;
+  gobject_class->finalize = test_object_finalize;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_BLAH,
+                                   g_param_spec_boxed ("blah", "Blah", "Blah",
+                                                       TEST_TYPE_BOXED,
+                                                       G_PARAM_READWRITE));
+}
+
+static void
+test_object_init (TestObject *object)
+{
+  object->blah.foo = 0;
+  object->blah.bar = FALSE;
+}
+
+static const gchar *serialize_data =
+"{\n"
+"  \"blah\" : {\n"
+"    \"foo\" : 42,\n"
+"    \"bar\" : true\n"
+"  }\n"
+"}";
+
+static void
+test_serialize_boxed (void)
+{
+  TestBoxed boxed = { 42, TRUE };
+  GObject *obj;
+  gchar *data;
+  gsize len;
+
+  obj = g_object_new (TEST_TYPE_OBJECT, "blah", &boxed, NULL);
+
+  data = json_gobject_to_data (obj, &len);
+
+  g_assert_cmpint (len, ==, strlen (serialize_data));
+  g_assert_cmpstr (data, ==, serialize_data);
+
+  if (g_test_verbose ())
+    g_print ("TestObject:\n%s\n", data);
+
+  g_free (data);
+  g_object_unref (obj);
+}
+
+static void
+test_deserialize_boxed (void)
+{
+
+  GObject *obj;
+
+  obj = json_gobject_from_data (TEST_TYPE_OBJECT, serialize_data, -1, NULL);
+  g_assert (TEST_IS_OBJECT (obj));
+  g_assert_cmpint (TEST_OBJECT (obj)->blah.foo, ==, 42);
+  g_assert (TEST_OBJECT (obj)->blah.bar);
+
+  g_object_unref (obj);
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_type_init ();
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/boxed/serialize-property", test_serialize_boxed);
+  g_test_add_func ("/boxed/deserialize-property", test_deserialize_boxed);
+
+  return g_test_run ();
+}
diff -Nru json-glib-0.7.6/tests/test-serialize-complex.c json-glib-0.10.2/tests/test-serialize-complex.c
--- json-glib-0.7.6/tests/test-serialize-complex.c	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/tests/test-serialize-complex.c	2009-11-12 11:59:59.000000000 +0000
@@ -86,6 +86,8 @@
   PROP_BLAH
 };
 
+static JsonSerializableIface *serializable_iface = NULL;
+
 static void json_serializable_iface_init (gpointer g_iface);
 
 G_DEFINE_TYPE_WITH_CODE (TestObject, test_object, G_TYPE_OBJECT,
@@ -121,6 +123,10 @@
 
       json_node_take_object (retval, obj);
     }
+  else
+    retval = serializable_iface->serialize_property (serializable,
+                                                     name,
+                                                     value, pspec);
 
   return retval;
 }
@@ -130,6 +136,8 @@
 {
   JsonSerializableIface *iface = g_iface;
 
+  serializable_iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE);
+
   iface->serialize_property = test_object_serialize_property;
 }
 
@@ -235,16 +243,40 @@
 test_serialize (void)
 {
   TestObject *obj = g_object_new (TEST_TYPE_OBJECT, NULL);
+  JsonParser *parser = json_parser_new ();
+  GError *error = NULL;
+  JsonObject *object;
+  JsonNode *node;
   gchar *data;
   gsize len;
 
-  data = json_serialize_gobject (G_OBJECT (obj), &len);
+  data = json_gobject_to_data (G_OBJECT (obj), &len);
 
   g_assert_cmpint (len, >, 0);
   if (g_test_verbose ())
     g_print ("TestObject:\n%s\n", data);
 
+  parser = json_parser_new ();
+  json_parser_load_from_data (parser, data, -1, &error);
+  g_assert (error == NULL);
+
+  node = json_parser_get_root (parser);
+  g_assert (json_node_get_node_type (node) == JSON_NODE_OBJECT);
+
+  object = json_node_get_object (node);
+  g_assert_cmpint (json_object_get_int_member (object, "foo"), ==, 42);
+  g_assert (json_object_get_boolean_member (object, "bar"));
+  g_assert_cmpstr (json_object_get_string_member (object, "baz"), ==, "Test");
+
+  node = json_object_get_member (object, "blah");
+  g_assert (json_node_get_node_type (node) == JSON_NODE_OBJECT);
+
+  object = json_node_get_object (node);
+  g_assert_cmpint (json_object_get_int_member (object, "foo"), ==, 42);
+  g_assert (json_object_get_boolean_member (object, "bar"));
+
   g_free (data);
+  g_object_unref (parser);
   g_object_unref (obj);
 }
 
diff -Nru json-glib-0.7.6/tests/test-serialize-full.c json-glib-0.10.2/tests/test-serialize-full.c
--- json-glib-0.7.6/tests/test-serialize-full.c	2009-08-12 11:42:54.000000000 +0100
+++ json-glib-0.10.2/tests/test-serialize-full.c	2009-11-12 12:00:41.000000000 +0000
@@ -42,6 +42,8 @@
   TestBoxed blah;
   TestEnum meh;
   gchar **mah;
+
+  TestObject *test;
 };
 
 struct _TestObjectClass
@@ -114,7 +116,8 @@
   PROP_BAZ,
   PROP_BLAH,
   PROP_MEH,
-  PROP_MAH
+  PROP_MAH,
+  PROP_TEST
 };
 
 static void json_serializable_iface_init (gpointer g_iface);
@@ -147,7 +150,6 @@
     {
       TestBoxed *boxed;
       JsonObject *obj;
-      JsonNode *val;
 
       retval = json_node_new (JSON_NODE_OBJECT);
       obj = json_object_new ();
@@ -191,6 +193,9 @@
   g_free (TEST_OBJECT (gobject)->baz);
   g_strfreev (TEST_OBJECT (gobject)->mah);
 
+  if (TEST_OBJECT (gobject)->test != NULL)
+    g_object_unref (TEST_OBJECT (gobject)->test);
+
   G_OBJECT_CLASS (test_object_parent_class)->finalize (gobject);
 }
 
@@ -205,19 +210,28 @@
     case PROP_FOO:
       TEST_OBJECT (gobject)->foo = g_value_get_int (value);
       break;
+
     case PROP_BAR:
       TEST_OBJECT (gobject)->bar = g_value_get_boolean (value);
       break;
+
     case PROP_BAZ:
       g_free (TEST_OBJECT (gobject)->baz);
       TEST_OBJECT (gobject)->baz = g_value_dup_string (value);
       break;
+
     case PROP_MEH:
       TEST_OBJECT (gobject)->meh = g_value_get_enum (value);
       break;
+
     case PROP_MAH:
       TEST_OBJECT (gobject)->mah = g_strdupv (g_value_get_boxed (value));
       break;
+
+    case PROP_TEST:
+      TEST_OBJECT (gobject)->test = g_value_dup_object (value);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
     }
@@ -234,21 +248,31 @@
     case PROP_FOO:
       g_value_set_int (value, TEST_OBJECT (gobject)->foo);
       break;
+
     case PROP_BAR:
       g_value_set_boolean (value, TEST_OBJECT (gobject)->bar);
       break;
+
     case PROP_BAZ:
       g_value_set_string (value, TEST_OBJECT (gobject)->baz);
       break;
+
     case PROP_BLAH:
       g_value_set_boxed (value, &(TEST_OBJECT (gobject)->blah));
       break;
+
     case PROP_MEH:
       g_value_set_enum (value, TEST_OBJECT (gobject)->meh);
       break;
+
     case PROP_MAH:
       g_value_set_boxed (value, TEST_OBJECT (gobject)->mah);
       break;
+
+    case PROP_TEST:
+      g_value_set_object (value, TEST_OBJECT (gobject)->test);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
     }
@@ -272,7 +296,8 @@
                                    PROP_BAR,
                                    g_param_spec_boolean ("bar", "Bar", "Bar",
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (gobject_class,
                                    PROP_BAZ,
                                    g_param_spec_string ("baz", "Baz", "Baz",
@@ -294,13 +319,18 @@
                                    g_param_spec_boxed ("mah", "Mah", "Mah",
                                                        G_TYPE_STRV,
                                                        G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+                                   PROP_TEST,
+                                   g_param_spec_object ("test", "Test", "Test",
+                                                        TEST_TYPE_OBJECT,
+                                                        G_PARAM_READWRITE));
 }
 
 static void
 test_object_init (TestObject *object)
 {
   object->foo = 0;
-  object->bar = TRUE;
+  object->bar = FALSE;
   object->baz = NULL; 
 
   object->blah.foo = object->foo;
@@ -309,26 +339,34 @@
   object->meh = TEST_ENUM_BAR;
 
   object->mah = NULL;
+
+  object->test = NULL;
 }
 
 static const gchar *var_test =
 "{\n"
-"  \"foo\" : 42,\n"
-"  \"bar\" : false,\n"
-"  \"baz\" : \"hello\",\n"
-"  \"meh\" : \"baz\",\n"
-"  \"mah\" : [ \"hello\", \", \", \"world\", \"!\" ]\n"
+"  \"foo\"  : 42,\n"
+"  \"bar\"  : true,\n"
+"  \"baz\"  : \"hello\",\n"
+"  \"meh\"  : \"baz\",\n"
+"  \"mah\"  : [ \"hello\", \", \", \"world\", \"!\" ],\n"
+"  \"test\" : {\n"
+"    \"bar\" : true,\n"
+"    \"baz\" : \"world\",\n"
+"    \"meh\" : \"foo\"\n"
+"  }\n"
 "}";
 
 static void
 test_deserialize (void)
 {
+  TestObject *test;
   GObject *object;
   GError *error;
   gchar *str;
 
   error = NULL;
-  object = json_construct_gobject (TEST_TYPE_OBJECT, var_test, -1, &error);
+  object = json_gobject_from_data (TEST_TYPE_OBJECT, var_test, -1, &error);
   if (error)
     g_error ("*** Unable to parse buffer: %s\n", error->message);
 
@@ -339,12 +377,12 @@
              " baz: %s\n"
              " meh: %s\n",
              TEST_OBJECT (object)->foo == 42            ? "<true>" : "<false>",
-             TEST_OBJECT (object)->bar == FALSE         ? "<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>");
 
   g_assert_cmpint (TEST_OBJECT (object)->foo, ==, 42);
-  g_assert_cmpint (TEST_OBJECT (object)->bar, ==, FALSE);
+  g_assert_cmpint (TEST_OBJECT (object)->bar, ==, TRUE);
   g_assert_cmpstr (TEST_OBJECT (object)->baz, ==, "hello");
   g_assert_cmpint (TEST_OBJECT (object)->meh, ==, TEST_ENUM_BAZ);
 
@@ -353,8 +391,14 @@
 
   str = g_strjoinv (NULL, TEST_OBJECT (object)->mah);
   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_object_unref (object);
 }
 
diff -Nru json-glib-0.7.6/tests/test-serialize-simple.c json-glib-0.10.2/tests/test-serialize-simple.c
--- json-glib-0.7.6/tests/test-serialize-simple.c	2009-06-24 13:06:20.000000000 +0100
+++ json-glib-0.10.2/tests/test-serialize-simple.c	2009-11-12 11:59:40.000000000 +0000
@@ -129,18 +129,18 @@
 test_object_init (TestObject *object)
 {
   object->foo = 42;
-  object->bar = TRUE;
+  object->bar = FALSE;
   object->baz = g_strdup ("Test");
 }
 
 static void
 test_serialize (void)
 {
-  TestObject *obj = g_object_new (TEST_TYPE_OBJECT, NULL);
+  TestObject *obj = g_object_new (TEST_TYPE_OBJECT, "bar", TRUE, NULL);
   gchar *data;
   gsize len;
 
-  data = json_serialize_gobject (G_OBJECT (obj), &len);
+  data = json_gobject_to_data (G_OBJECT (obj), &len);
 
   g_assert (data != NULL);
   g_assert_cmpint (len, >, 0);