merge GVariant

docs/reference/glib/Makefile.am

@@ -42,12 +42,13 @@ IGNORE_HFILES=			\
 	galias.h		\
 	gmirroringtable.h	\
 	gscripttable.h		\
-	gvariant-serialiser.h	\
-	gvarianttypeinfo.h	\
 	glib-mirroring-tab	\
 	gnulib			\
 	pcre			\
-	update-pcre
+	update-pcre		\
+	gvariant-serialiser.h	\
+	gvariant-core.h		\
+	gvarianttypeinfo.h
 
 # Images to copy into HTML directory
 HTML_IMAGES =  				\

docs/reference/glib/glib-docs.sgml

@@ -120,6 +120,7 @@ synchronize their operation.
       <xi:include href="xml/caches.xml" />
       <xi:include href="xml/allocators.xml" />
       <xi:include href="xml/gvarianttype.xml"/>
+      <xi:include href="xml/gvariant.xml"/>
   </chapter>
 
   <chapter id="tools">

docs/reference/glib/glib-sections.txt

@@ -2775,6 +2775,24 @@ g_variant_type_key
 g_variant_type_value
 </SECTION>
 
+<SECTION>
+<TITLE>GVariant</TITLE>
+<FILE>gvariant</FILE>
+GVariant
+g_variant_unref
+g_variant_ref
+g_variant_ref_sink
+
+<SUBSECTION>
+g_variant_n_children
+g_variant_get_child_value
+
+<SUBSECTION>
+g_variant_get_size
+g_variant_get_data
+g_variant_store
+</SECTION>
+
 <SECTION>
 <FILE>ghostutils</FILE>
 <TITLE>Hostname Utilities</TITLE>

docs/reference/glib/tmpl/.gitignore

@@ -11,6 +11,7 @@ datalist.sgml
 ghostutils.sgml
 gurifuncs.sgml
 gvarianttype.sgml
+gvariant.sgml
 hash_tables.sgml
 iochannels.sgml
 linked_lists_double.sgml

docs/reference/gobject/gobject-sections.txt

@@ -347,6 +347,7 @@ G_TYPE_REGEX
 G_TYPE_ARRAY
 G_TYPE_BYTE_ARRAY
 G_TYPE_PTR_ARRAY
+G_TYPE_VARIANT
 GStrv
 
 <SUBSECTION Standard>
@@ -361,6 +362,7 @@ g_regex_get_type
 g_array_get_type
 g_byte_array_get_type
 g_ptr_array_get_type
+g_variant_get_gtype
 </SECTION>
 
 <SECTION>