[glib/gsettings: 30/327] Merge branch 'master' into gvariant
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/gsettings: 30/327] Merge branch 'master' into gvariant
- Date: Thu, 27 Aug 2009 17:48:07 +0000 (UTC)
commit 3df69bfb5e1e257fea74e123882ba65b3e4b5da2
Merge: d64beb4... 491a036...
Author: Ryan Lortie <desrt desrt ca>
Date: Sun Apr 26 12:35:56 2009 -0400
Merge branch 'master' into gvariant
Now we can have GVariant and GResolver at the same time. :)
Conflicts:
docs/reference/glib/glib-sections.txt
glib/tests/Makefile.am
NEWS | 44 +
configure.in | 57 ++-
docs/reference/gio/Makefile.am | 6 +-
docs/reference/gio/gio-docs.xml | 12 +
docs/reference/gio/gio-sections.txt | 216 +++++
docs/reference/gio/gio.types | 9 +
docs/reference/glib/glib-docs.sgml | 2 +
docs/reference/glib/glib-sections.txt | 11 +
docs/reference/glib/tmpl/.gitignore | 1 +
docs/reference/glib/tmpl/ghostutils.sgml | 64 ++
docs/reference/glib/tmpl/option.sgml | 603 ------------
gio/Makefile.am | 35 +-
gio/gasynchelper.c | 9 +-
gio/gcancellable.c | 214 ++++-
gio/gcancellable.h | 6 +
gio/gfile.c | 2 +-
gio/gfileicon.c | 4 +-
gio/ginetaddress.c | 752 +++++++++++++++
gio/ginetaddress.h | 101 ++
gio/ginetsocketaddress.c | 306 ++++++
gio/ginetsocketaddress.h | 69 ++
gio/gio.h | 9 +
gio/gio.symbols | 145 +++
gio/gioenums.h | 34 +
gio/giotypes.h | 9 +
gio/glocalfileinfo.c | 5 +-
gio/gnetworkaddress.c | 462 +++++++++
gio/gnetworkaddress.h | 65 ++
gio/gnetworkingprivate.h | 85 ++
gio/gnetworkservice.c | 658 +++++++++++++
gio/gnetworkservice.h | 69 ++
gio/gresolver.c | 867 +++++++++++++++++
gio/gresolver.h | 159 ++++
gio/gsocketaddress.c | 321 +++++++
gio/gsocketaddress.h | 77 ++
gio/gsocketaddressenumerator.c | 191 ++++
gio/gsocketaddressenumerator.h | 89 ++
gio/gsocketconnectable.c | 148 +++
gio/gsocketconnectable.h | 68 ++
gio/gsrvtarget.c | 337 +++++++
gio/gsrvtarget.h | 52 +
gio/gthemedicon.c | 12 +-
gio/gthreadedresolver.c | 617 ++++++++++++
gio/gthreadedresolver.h | 50 +
gio/gunixinputstream.c | 8 +-
gio/gunixoutputstream.c | 8 +-
gio/gunixresolver.c | 433 +++++++++
gio/gunixresolver.h | 53 ++
gio/gunixsocketaddress.c | 206 ++++
gio/gunixsocketaddress.h | 61 ++
gio/gvolume.c | 14 +-
gio/gwin32resolver.c | 481 ++++++++++
gio/gwin32resolver.h | 49 +
gio/libasyncns/Makefile.am | 15 +
gio/libasyncns/README | 7 +
gio/libasyncns/asyncns.c | 1498 ++++++++++++++++++++++++++++++
gio/libasyncns/asyncns.h | 163 ++++
gio/libasyncns/g-asyncns.h | 28 +
gio/libasyncns/update.sh | 20 +
gio/pltcheck.sh | 2 +-
gio/tests/.gitignore | 2 +
gio/tests/Makefile.am | 8 +-
gio/tests/resolver.c | 506 ++++++++++
glib/Makefile.am | 2 +
glib/ghostutils.c | 758 +++++++++++++++
glib/ghostutils.h | 40 +
glib/glib.h | 1 +
glib/glib.symbols | 10 +
glib/goption.c | 109 +++
glib/goption.h | 209 +++++-
glib/gtimer.c | 6 +-
glib/gtypes.h | 13 +
glib/tests/.gitignore | 1 +
glib/tests/Makefile.am | 3 +
glib/tests/hostutils.c | 267 ++++++
glibconfig.h.win32.in | 3 +
gobject/gtype.h | 71 +-
po/am.po | 154 ++--
po/ar.po | 839 +++++++++---------
po/as.po | 871 +++++++++---------
po/az.po | 154 ++--
po/be.po | 156 ++--
po/be latin po | 156 ++--
po/bg.po | 836 +++++++++---------
po/bn.po | 154 ++--
po/bn_IN.po | 154 ++--
po/bs.po | 154 ++--
po/ca.po | 836 +++++++++---------
po/cs.po | 154 ++--
po/cy.po | 154 ++--
po/da.po | 843 +++++++++---------
po/de.po | 836 +++++++++---------
po/dz.po | 154 ++--
po/el.po | 863 +++++++++---------
po/en_CA.po | 154 ++--
po/en_GB.po | 836 +++++++++---------
po/eo.po | 154 ++--
po/es.po | 841 +++++++++---------
po/et.po | 154 ++--
po/eu.po | 894 +++++++++---------
po/fa.po | 154 ++--
po/fi.po | 154 ++--
po/fr.po | 836 +++++++++---------
po/ga.po | 154 ++--
po/gl.po | 836 +++++++++---------
po/gu.po | 154 ++--
po/he.po | 154 ++--
po/hi.po | 154 ++--
po/hr.po | 154 ++--
po/hu.po | 905 +++++++++---------
po/hy.po | 154 ++--
po/id.po | 154 ++--
po/is.po | 154 ++--
po/it.po | 839 +++++++++---------
po/ja.po | 836 +++++++++---------
po/ka.po | 154 ++--
po/kn.po | 880 +++++++++---------
po/ko.po | 154 ++--
po/ku.po | 154 ++--
po/lt.po | 836 +++++++++---------
po/lv.po | 154 ++--
po/mai.po | 154 ++--
po/mg.po | 154 ++--
po/mk.po | 154 ++--
po/ml.po | 886 +++++++++---------
po/mn.po | 154 ++--
po/mr.po | 154 ++--
po/ms.po | 154 ++--
po/nb.po | 836 +++++++++---------
po/ne.po | 154 ++--
po/nl.po | 154 ++--
po/nn.po | 154 ++--
po/oc.po | 154 ++--
po/or.po | 871 +++++++++---------
po/pa.po | 868 +++++++++---------
po/pl.po | 836 +++++++++---------
po/ps.po | 866 +++++++++---------
po/pt.po | 154 ++--
po/pt_BR.po | 836 +++++++++---------
po/ro.po | 154 ++--
po/ru.po | 836 +++++++++---------
po/rw.po | 154 ++--
po/si.po | 154 ++--
po/sk.po | 154 ++--
po/sl.po | 1165 +++++++++++------------
po/sq.po | 156 ++--
po/sr.po | 154 ++--
po/sr ije po | 154 ++--
po/sr latin po | 154 ++--
po/sv.po | 1203 ++++++++++++------------
po/ta.po | 888 +++++++++---------
po/te.po | 154 ++--
po/th.po | 154 ++--
po/tl.po | 154 ++--
po/tr.po | 154 ++--
po/tt.po | 154 ++--
po/uk.po | 154 ++--
po/vi.po | 154 ++--
po/wa.po | 154 ++--
po/xh.po | 154 ++--
po/yi.po | 154 ++--
po/zh_CN.po | 839 +++++++++---------
po/zh_HK.po | 154 ++--
po/zh_TW.po | 154 ++--
tests/testglib.c | 18 +-
165 files changed, 28872 insertions(+), 17584 deletions(-)
---
diff --cc docs/reference/glib/glib-docs.sgml
index e1eb902,4d7c36d..1fccc7d
--- a/docs/reference/glib/glib-docs.sgml
+++ b/docs/reference/glib/glib-docs.sgml
@@@ -66,10 -66,8 +66,11 @@@
<!ENTITY glib-Version SYSTEM "xml/version.xml">
<!ENTITY glib-Uri SYSTEM "xml/gurifuncs.xml">
<!ENTITY glib-Testing SYSTEM "xml/testing.xml">
+ <!ENTITY glib-Hostutils SYSTEM "xml/ghostutils.xml">
+<!ENTITY glib-GVariantType SYSTEM "xml/gvarianttype.xml">
+<!ENTITY glib-GVariant SYSTEM "xml/gvariant.xml">
+
<!ENTITY glib-Compiling SYSTEM "compiling.sgml">
<!ENTITY glib-Building SYSTEM "building.sgml">
<!ENTITY glib-Cross SYSTEM "cross.sgml">
diff --cc docs/reference/glib/glib-sections.txt
index ba901f8,4feea78..d093990
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@@ -2658,175 -2654,15 +2658,186 @@@ g_test_log_buffer_po
g_test_log_msg_free
</SECTION>
+<SECTION>
+<TITLE>GVariantType</TITLE>
+<FILE>gvarianttype</FILE>
+GVariantTypeClass
+g_variant_type_class_is_basic
+g_variant_type_class_is_container
+
+<SUBSECTION>
+GVariantType
+G_VARIANT_TYPE
+
+<SUBSECTION>
+G_VARIANT_TYPE_BOOLEAN
+G_VARIANT_TYPE_BYTE
+G_VARIANT_TYPE_INT16
+G_VARIANT_TYPE_UINT16
+G_VARIANT_TYPE_INT32
+G_VARIANT_TYPE_UINT32
+G_VARIANT_TYPE_INT64
+G_VARIANT_TYPE_UINT64
+G_VARIANT_TYPE_DOUBLE
+G_VARIANT_TYPE_STRING
+G_VARIANT_TYPE_OBJECT_PATH
+G_VARIANT_TYPE_SIGNATURE
+G_VARIANT_TYPE_VARIANT
+G_VARIANT_TYPE_ANY
+G_VARIANT_TYPE_ANY_BASIC
+G_VARIANT_TYPE_ANY_MAYBE
+G_VARIANT_TYPE_ANY_ARRAY
+G_VARIANT_TYPE_ANY_STRUCT
+G_VARIANT_TYPE_UNIT
+G_VARIANT_TYPE_ANY_DICT_ENTRY
+G_VARIANT_TYPE_ANY_DICTIONARY
+
+<SUBSECTION>
+g_variant_type_free
+g_variant_type_copy
+g_variant_type_new
+
+<SUBSECTION>
+g_variant_type_string_is_valid
+g_variant_type_string_scan
+g_variant_type_get_string_length
+g_variant_type_peek_string
+g_variant_type_dup_string
+
+<SUBSECTION>
+g_variant_type_get_class
+g_variant_type_is_in_class
+g_variant_type_is_basic
+g_variant_type_is_container
+g_variant_type_is_concrete
+
+<SUBSECTION>
+g_variant_type_hash
+g_variant_type_equal
+g_variant_type_matches
+
+<SUBSECTION>
+g_variant_type_new_maybe
+g_variant_type_new_array
+GVariantTypeGetter
+g_variant_type_new_struct
+g_variant_type_new_dict_entry
+
+<SUBSECTION>
+g_variant_type_element
+g_variant_type_n_items
+g_variant_type_first
+g_variant_type_next
+g_variant_type_key
+g_variant_type_value
+</SECTION>
+
+<SECTION>
+<TITLE>GVariant</TITLE>
+<FILE>gvariant</FILE>
+GVariant
+g_variant_ref
+g_variant_ref_sink
+g_variant_unref
+g_variant_get_type
+g_variant_get_type_class
+g_variant_matches
+g_variant_get_type_string
+g_variant_is_basic
+g_variant_is_container
+
+<SUBSECTION>
+g_variant_new_boolean
+g_variant_new_byte
+g_variant_new_int16
+g_variant_new_uint16
+g_variant_new_int32
+g_variant_new_uint32
+g_variant_new_int64
+g_variant_new_uint64
+g_variant_new_double
+g_variant_new_string
+g_variant_new_object_path
+g_variant_is_object_path
+g_variant_new_signature
+g_variant_is_signature
+g_variant_new_variant
+
+<SUBSECTION>
+g_variant_get_boolean
+g_variant_get_byte
+g_variant_get_int16
+g_variant_get_uint16
+g_variant_get_int32
+g_variant_get_uint32
+g_variant_get_int64
+g_variant_get_uint64
+g_variant_get_double
+g_variant_get_string
+g_variant_dup_string
+g_variant_get_variant
+
+<SUBSECTION>
+g_variant_n_children
+g_variant_get_child
+g_variant_get_fixed
+g_variant_get_fixed_array
+
+<SUBSECTION>
+g_variant_get
+g_variant_get_va
+g_variant_new
+g_variant_new_va
+g_variant_format_string_scan
+
+<SUBSECTION>
+GVariantIter
+g_variant_iter_cancel
+g_variant_iter_init
+g_variant_iter_next
+g_variant_iter_was_cancelled
+g_variant_iterate
+
+<SUBSECTION>
+GVariantBuilder
+g_variant_builder_add_value
+g_variant_builder_cancel
+g_variant_builder_close
+g_variant_builder_end
+g_variant_builder_new
+g_variant_builder_open
+g_variant_builder_add
+G_VARIANT_BUILDER_ERROR
+GVariantBuilderError
+g_variant_builder_check_add
+g_variant_builder_check_end
+
+<SUBSECTION>
+g_variant_markup_parse
+g_variant_markup_parse_context_end
+g_variant_markup_parse_context_new
+g_variant_markup_print
+g_variant_markup_subparser_end
+g_variant_markup_subparser_start
+
+<SUBSECTION>
+GVariantFlags
+g_variant_load
+g_variant_store
+g_variant_flatten
+g_variant_from_data
+g_variant_from_slice
+g_variant_get_data
+g_variant_get_size
+
+ <SECTION>
+ <FILE>ghostutils</FILE>
+ <TITLE>Hostname Utilities</TITLE>
+ g_hostname_to_ascii
+ g_hostname_to_unicode
+ <SUBSECTION>
+ g_hostname_is_non_ascii
+ g_hostname_is_ascii_encoded
+ <SUBSECTION>
+ g_hostname_is_ip_address
</SECTION>
diff --cc glib/tests/Makefile.am
index a5bfe61,673d338..b6475c3
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@@ -44,27 -44,9 +44,30 @@@ markup_subparser_LDADD = $(progs_lda
TEST_PROGS += array-test
array_test_LDADD = $(progs_ldadd)
+TEST_PROGS += gvariant-big
+gvariant_big_LDADD = $(progs_ldadd)
+
+TEST_PROGS += gvariant-endian
+gvariant_endian_LDADD = $(progs_ldadd)
+
+TEST_PROGS += gvariant-fuzz
+gvariant_fuzz_LDADD = $(progs_ldadd)
+
+TEST_PROGS += gvariant-markup
+gvariant_markup_LDADD = $(progs_ldadd)
+
+TEST_PROGS += gvariant-random
+gvariant_random_LDADD = $(progs_ldadd)
+
+TEST_PROGS += gvariant-serialiser
+gvariant_serialiser_LDADD = $(progs_ldadd)
+
+TEST_PROGS += gvariant-varargs
+gvariant_varargs_LDADD = $(progs_ldadd)
+
+ TEST_PROGS += hostutils
+ hostutils_LDADD = $(progs_ldadd)
+
if OS_UNIX
# some testing of gtester funcitonality
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
