[glib/gvariant: 11/11] Merge branch 'master' into gvariant

From: Ryan Lortie <ryanl src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [glib/gvariant: 11/11] Merge branch 'master' into gvariant
Date: Mon, 25 Jan 2010 16:58:11 +0000 (UTC)
commit 01b27b8ced1c8833b33dd04d0f722dbe9dfaa203
Merge: a966930 b4c0b10
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Jan 25 11:51:27 2010 -0500

    Merge branch 'master' into gvariant
    
    GVariantType is now on 'master'
    
    Conflicts:
    	docs/reference/glib/glib-docs.sgml
    	docs/reference/glib/glib-sections.txt
    	glib/Makefile.am
    	glib/glib.h
    	glib/glib.symbols
    	glib/gvarianttype.c
    	glib/gvarianttype.h

 gio/.gitignore            |    1 +
 gio/gsimpleasyncresult.c  |    4 +-
 glib/glib.symbols         |   83 ++--
 glib/gslice.c             |   16 +-
 glib/gvarianttype.c       |  233 +++++++--
 glib/gvarianttype.h       |   25 +-
 glib/tests/.gitignore     |    1 +
 glib/tests/Makefile.am    |    3 +
 glib/tests/gvarianttype.c |  650 +++++++++++++++++++++++
 gobject/Makefile.am       |    5 +-
 gobject/gboxed.c          |  125 +----
 gobject/gtype-private.h   |   41 ++
 gobject/gtype.c           |   45 ++
 po/bg.po                  |  974 +++++++++++++++++-----------------
 po/bn.po                  | 1295 ++++++++++++++++++++++++---------------------
 15 files changed, 2194 insertions(+), 1307 deletions(-)
---
diff --cc glib/glib.symbols
index ba4cb82,ad2b509..246cda3
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@@ -1646,192 -1644,40 +1646,177 @@@ g_match_info_fetch_al
  #endif
  #endif
  
+ #if IN_HEADER(__G_VARIANT_TYPE_H__)
+ #if IN_FILE(__G_VARIANT_TYPE_C__)
+ g_variant_type_string_is_valid
+ g_variant_type_string_scan
+ g_variant_type_free
+ g_variant_type_copy
+ g_variant_type_new
+ g_variant_type_get_string_length
+ g_variant_type_peek_string
+ g_variant_type_dup_string
+ g_variant_type_is_definite
+ g_variant_type_is_container
+ g_variant_type_is_basic
+ g_variant_type_is_maybe
+ g_variant_type_is_array
+ g_variant_type_is_tuple
+ g_variant_type_is_dict_entry
+ g_variant_type_hash
+ g_variant_type_equal
+ g_variant_type_is_subtype_of
+ g_variant_type_element
+ g_variant_type_first
+ g_variant_type_next
+ g_variant_type_n_items
+ g_variant_type_key
+ g_variant_type_value
+ g_variant_type_new_array
+ g_variant_type_new_maybe
+ g_variant_type_new_tuple
+ g_variant_type_new_dict_entry
+ 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_TYPE_H__)
- #if IN_FILE(__G_VARIANT_TYPE_C__)
- g_variant_type_string_is_valid
- g_variant_type_string_scan
- g_variant_type_free
- g_variant_type_copy
- g_variant_type_new
- g_variant_type_get_string_length
- g_variant_type_peek_string
- g_variant_type_dup_string
- g_variant_type_is_definite
- g_variant_type_is_container
- g_variant_type_is_basic
- g_variant_type_is_maybe
- g_variant_type_is_array
- g_variant_type_is_tuple
- g_variant_type_is_dict_entry
- g_variant_type_hash
- g_variant_type_equal
- g_variant_type_is_subtype_of
- g_variant_type_element
- g_variant_type_first
- g_variant_type_next
- g_variant_type_n_items
- g_variant_type_key
- g_variant_type_value
- g_variant_type_new_array
- g_variant_type_new_maybe
- g_variant_type_new_tuple
- g_variant_type_new_dict_entry
- #endif
- #endif
- 
- #if IN_HEADER(__G_VARIANT_TYPE_INFO_H__)
- #if IN_FILE(__G_VARIANT_TYPE_INFO_C__)
- g_variant_type_info_get_type
- g_variant_type_info_get_class
- g_variant_type_info_get_string
- g_variant_type_info_query
- g_variant_type_info_element
- g_variant_type_info_query_element
- g_variant_type_info_n_members
- g_variant_type_info_member_info
- g_variant_type_info_get
- g_variant_type_info_ref
- g_variant_type_info_unref
- #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
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]