[glib/gvariant: 27/27] Merge branch 'serialiser' into gvariant

[Ryan Lortie <ryanl src gnome org>]

commit 1433655e23634446b990d1cf782b22ad6430496a
Merge: 7512d2f d0961d2
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Feb 5 00:41:26 2010 -0500

    Merge branch 'serialiser' into gvariant
    
    Conflicts:
    	glib/Makefile.am
    	glib/gvariant-serialiser.c
    	glib/gvariant-serialiser.h

 build/win32/vs9/Makefile.am                        |   11 +-
 build/win32/vs9/README                             |    4 -
 build/win32/vs9/README.txt                         |   37 +
 build/win32/vs9/gio.vcproj                         |  192 +--
 build/win32/vs9/glib-genmarshal.vcproj             |  138 +--
 build/win32/vs9/glib.vcproj                        |  202 +--
 build/win32/vs9/glib.vsprops                       |  250 +++
 build/win32/vs9/gmodule.vcproj                     |  190 +--
 build/win32/vs9/gobject.vcproj                     |  186 +--
 build/win32/vs9/gspawn-win32-helper-console.vcproj |  142 +--
 build/win32/vs9/gspawn-win32-helper.vcproj         |  142 +--
 build/win32/vs9/gthread.vcproj                     |  158 +--
 build/win32/vs9/install.vcproj                     |  172 +--
 build/win32/vs9/testglib.vcproj                    |  142 +--
 configure.in                                       |    1 +
 gio/Makefile.am                                    |   18 +-
 gio/gio.rc.in                                      |    2 +-
 gio/glocalfile.c                                   |   23 +-
 gio/glocalfileinfo.c                               |   10 +-
 gio/libasyncns/asyncns.c                           |    8 +
 glib/Makefile.am                                   |    8 +-
 glib/garray.c                                      |   21 +
 glib/giowin32.c                                    |   24 +-
 glib/gkeyfile.c                                    |    5 +-
 glib/glib.rc.in                                    |    2 +-
 glib/glib.symbols                                  |   12 -
 glib/gmappedfile.c                                 |    5 +-
 glib/gstdio.c                                      |   24 +-
 glib/gstdio.h                                      |   37 +
 glib/gvariant-serialiser.c                         |  990 +++++----
 glib/gvariant-serialiser.h                         |   21 +-
 glib/gvarianttypeinfo.c                            |   10 +-
 glib/tests/.gitignore                              |    2 +-
 glib/tests/Makefile.am                             |    4 +-
 glib/tests/gvariant.c                              | 2284 ++++++++++++++++++++
 glib/tests/gvarianttype.c                          | 1039 ---------
 gmodule/gmodule.rc.in                              |    2 +-
 gobject/gobject.rc.in                              |    2 +-
 gthread/gthread.rc.in                              |    2 +-
 po/cs.po                                           | 1012 +++++-----
 tests/testglib.c                                   |   24 -
 41 files changed, 4019 insertions(+), 3539 deletions(-)
---
diff --cc glib/Makefile.am
index 63e6704,f4d4a0f..d221fef
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@@ -172,13 -172,8 +172,15 @@@ libglib_2_0_la_SOURCES = 	
  	gunicodeprivate.h	\
  	gurifuncs.c 		\
  	gutils.c		\
- 	gvariant-serialiser.h	\
- 	gvariant-serialiser.c	\
 +	gvariant-private.h	\
 +	gvariant-core.c		\
 +	gvariant-parser.c	\
 +	gvariant-printer.c	\
 +	gvariant-markup.c	\
++	gvariant-util.c		\
++	gvariant-valist.c	\
+ 	gvariant-serialiser.h	\
+ 	gvariant-serialiser.c	\
  	gvarianttypeinfo.h	\
  	gvarianttypeinfo.c	\
  	gvarianttype.c		\
diff --cc glib/glib.symbols
index c78d30a,63b2b7b..23a1ffb
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@@ -1688,143 -1688,6 +1688,131 @@@ g_variant_type_checked
  #endif
  #endif
  
 +#if IN_HEADER(__G_VARIANT_H__)
 +#if IN_FILE(__G_VARIANT_CORE_C__)
 +g_variant_load
 +g_variant_from_slice
 +g_variant_from_data
 +g_variant_store
 +g_variant_get_data
 +g_variant_get_size
 +g_variant_ref
 +g_variant_ref_sink
 +g_variant_unref
 +g_variant_get_fixed
 +g_variant_get_fixed_array
 +g_variant_get_child_value
 +g_variant_n_children
 +g_variant_get_type
 +g_variant_classify
 +#endif
 +
 +#if IN_FILE(__G_VARIANT_UTIL_C__)
 +g_variant_from_file
 +g_variant_flatten
 +g_variant_get_type_string
 +g_variant_is_basic
 +g_variant_is_container
 +g_variant_has_type
 +g_variant_new_boolean
 +g_variant_new_byte
 +g_variant_new_uint16
 +g_variant_new_int16
 +g_variant_new_uint32
 +g_variant_new_int32
 +g_variant_new_handle
 +g_variant_new_uint64
 +g_variant_new_int64
 +g_variant_new_double
 +g_variant_new_string
 +g_variant_new_strv
 +g_variant_new_object_path
 +g_variant_is_object_path
 +g_variant_new_signature
 +g_variant_is_signature
 +g_variant_new_variant
 +g_variant_get_boolean
 +g_variant_get_byte
 +g_variant_get_uint16
 +g_variant_get_int16
 +g_variant_get_uint32
 +g_variant_get_int32
 +g_variant_get_handle
 +g_variant_get_uint64
 +g_variant_get_int64
 +g_variant_get_double
 +g_variant_get_string
 +g_variant_dup_string
 +g_variant_get_variant
 +g_variant_get_strv
 +g_variant_dup_strv
 +g_variant_iter_init
 +g_variant_iter_next_value
 +g_variant_iter_cancel
 +g_variant_iter_was_cancelled
 +g_variant_builder_add_value
 +g_variant_builder_open
 +g_variant_builder_close
 +g_variant_builder_check_add
 +g_variant_builder_check_end
 +g_variant_builder_new
 +g_variant_builder_end
 +g_variant_builder_cancel
 +g_variant_lookup_value
 +#endif
 +
 +#if IN_FILE(__G_VARIANT_PARSER_C__)
 +g_variant_parse
 +g_variant_parse_full
 +g_variant_new_parsed
 +g_variant_new_parsed_va
 +#endif
 +
 +#if IN_FILE(__G_VARIANT_PRINTER_C__)
 +g_variant_print
 +g_variant_print_string
 +#endif
 +
 +#if IN_FILE(__G_VARIANT_MARKUP_C__)
 +g_variant_markup_print
 +g_variant_markup_print_string
 +g_variant_markup_subparser_start
 +g_variant_markup_subparser_end
 +g_variant_markup_parse_context_new
 +g_variant_markup_parse_context_end
 +g_variant_markup_parse
 +#endif
 +
 +#if IN_FILE(__G_VARIANT_VALIST_C__)
 +g_variant_iter_next
 +g_variant_builder_add
 +g_variant_new
 +g_variant_get
 +g_variant_format_string_scan_type
 +g_variant_format_string_scan
 +g_variant_new_va
 +g_variant_get_va
 +g_variant_get_child
 +g_variant_lookup
 +#endif
 +#endif
 +
- #if IN_HEADER(__G_VARIANT_SERIALISER_H__)
- #if IN_FILE(__G_VARIANT_SERIALISER_C__)
- g_variant_serialised_n_children
- g_variant_serialised_get_child
- g_variant_serialiser_needed_size
- g_variant_serialiser_serialise
- g_variant_serialised_assert_invariant
- g_variant_serialised_is_normal
- g_variant_serialised_byteswap
- #endif
- #endif
- 
 +#if IN_HEADER(__G_VARIANT_PRIVATE_H__)
 +#if IN_FILE(__G_VARIANT_CORE_C__)
 +g_variant_new_tree
 +g_variant_assert_invariant
 +g_variant_is_trusted
 +g_variant_load_fixed
 +g_variant_is_normal_
 +#endif
 +
 +#if IN_FILE(__G_VARIANT_UTIL_C__)
 +g_variant_dump_data
 +g_variant_iter_should_free
 +g_variant_deep_copy
 +#endif
 +#endif
 +
  #if IN_HEADER(__G_WIN32_H__)
  #if IN_FILE(__G_WIN32_H__)
  #ifdef G_OS_WIN32
diff --cc glib/gvariant-serialiser.c
index 68e4480,c69edbd..c115bcc
--- a/glib/gvariant-serialiser.c
+++ b/glib/gvariant-serialiser.c
@@@ -680,7 -856,7 +856,12 @@@ gvs_tuple_get_child (GVariantSerialise
    else
      {
        if (offset_size * (member_info->i + 1) > value.size)
--        return child;
++        {
++          /* if the child is fixed size, return its size */
++          g_variant_type_info_query (child.type_info, NULL, &child.size);
++
++          return child;
++        }
      }
  
    if (member_info->i + 1)