[glib/gvariant: 38/39] Merge branch 'master' into gvariant

[Ryan Lortie <ryanl src gnome org>]

commit f627636738a2eeabb618cd3bb9cdc239fd5de802
Merge: cae2e44 e2bc5c2
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Feb 2 00:11:56 2010 -0500

    Merge branch 'master' into gvariant
    
    GVariantTypeInfo is now on 'master'.
    
    Conflicts:
    	docs/reference/glib/tmpl/threads.sgml
    	glib/Makefile.am

 docs/reference/glib/tmpl/.gitignore               |   25 +
 docs/reference/glib/tmpl/allocators.sgml          |   57 -
 docs/reference/glib/tmpl/arrays.sgml              |  339 ----
 docs/reference/glib/tmpl/arrays_byte.sgml         |  211 ---
 docs/reference/glib/tmpl/arrays_pointer.sgml      |  308 ----
 docs/reference/glib/tmpl/caches.sgml              |  162 --
 docs/reference/glib/tmpl/checksum.sgml            |  145 --
 docs/reference/glib/tmpl/completion.sgml          |  158 --
 docs/reference/glib/tmpl/datalist.sgml            |  244 ---
 docs/reference/glib/tmpl/datasets.sgml            |  212 ---
 docs/reference/glib/tmpl/iochannels.sgml          |  666 --------
 docs/reference/glib/tmpl/linked_lists_double.sgml |  467 ------
 docs/reference/glib/tmpl/linked_lists_single.sgml |  394 -----
 docs/reference/glib/tmpl/memory_chunks.sgml       |  331 ----
 docs/reference/glib/tmpl/patterns.sgml            |  124 --
 docs/reference/glib/tmpl/quarks.sgml              |  124 --
 docs/reference/glib/tmpl/random_numbers.sgml      |  206 ---
 docs/reference/glib/tmpl/relations.sgml           |  204 ---
 docs/reference/glib/tmpl/sequence.sgml            |  432 -----
 docs/reference/glib/tmpl/shell.sgml               |   68 -
 docs/reference/glib/tmpl/string_chunks.sgml       |  108 --
 docs/reference/glib/tmpl/thread_pools.sgml        |  202 ---
 docs/reference/glib/tmpl/threads.sgml             | 1819 ---------------------
 docs/reference/glib/tmpl/timers.sgml              |  110 --
 docs/reference/glib/tmpl/trees-binary.sgml        |  250 ---
 docs/reference/glib/tmpl/trees-nary.sgml          |  501 ------
 gio/gfileinfo.h                                   |    4 +-
 gio/gsocket.c                                     |    2 +-
 glib/Makefile.am                                  |    2 +
 glib/garray.c                                     |  629 +++++++
 glib/gbitlock.c                                   |    4 +-
 glib/gbitlock.h                                   |    6 +-
 glib/gcache.c                                     |  134 ++
 glib/gchecksum.c                                  |   22 +
 glib/gcompletion.c                                |  122 ++
 glib/gdataset.c                                   |  428 +++++-
 glib/ghostutils.c                                 |   13 +-
 glib/giochannel.c                                 |  196 +++
 glib/giounix.c                                    |   36 +
 glib/giowin32.c                                   |   52 +
 glib/glib.symbols                                 |    6 +-
 glib/glist.c                                      |  154 ++
 glib/gmem.c                                       |  353 ++++
 glib/gnode.c                                      |  116 ++
 glib/gpattern.c                                   |  103 ++
 glib/grand.c                                      |   64 +
 glib/grel.c                                       |  162 ++
 glib/gsequence.c                                  |   69 +
 glib/gshell.c                                     |   22 +
 glib/gslist.c                                     |  113 ++
 glib/gstrfuncs.c                                  |    6 +-
 glib/gstring.c                                    |   35 +
 glib/gtestutils.c                                 |    1 +
 glib/gtestutils.h                                 |    6 +-
 glib/gthread.c                                    | 1580 ++++++++++++++++++-
 glib/gthreadpool.c                                |   50 +
 glib/gtimer.c                                     |   92 +-
 glib/gtree.c                                      |   67 +
 glib/gurifuncs.c                                  |    1 +
 glib/gurifuncs.h                                  |    2 +-
 glib/gvarianttype.c                               |    3 +-
 glib/tests/hostutils.c                            |   19 +
 gobject/gvaluecollector.h                         |   10 +-
 po/POTFILES.in                                    |    8 +
 po/es.po                                          |  984 ++++++------
 po/fr.po                                          | 1008 ++++++------
 po/nb.po                                          |  965 ++++++------
 67 files changed, 6205 insertions(+), 9311 deletions(-)
---
diff --cc glib/Makefile.am
index ff9ce86,20daa80..8ba739c
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@@ -172,18 -172,9 +172,20 @@@ libglib_2_0_la_SOURCES = 	
  	gunicodeprivate.h	\
  	gurifuncs.c 		\
  	gutils.c		\
 +	gvariant-private.h	\
 +	gvariant-core.c		\
 +	gvariant-parser.c	\
 +	gvariant-printer.c	\
 +	gvariant-markup.c	\
 +	gvariant-serialiser.h	\
 +	gvariant-serialiser.c	\
+ 	gvarianttypeinfo.h	\
+ 	gvarianttypeinfo.c	\
  	gvarianttype.c		\
 +	gvarianttypeinfo.h	\
 +	gvarianttypeinfo.c	\
 +	gvariant-util.c		\
 +	gvariant-valist.c	\
  	gdebug.h		\
  	gprintf.c		\
  	gprintfint.h