[glib/gdbus: 12/12] Merge branch 'master' into gdbus

[David Zeuthen <davidz src gnome org>]

commit 652ead890e30f89449db181d54b66d55f71bf84c
Merge: e68584b... 49dfb50...
Author: David Zeuthen <davidz redhat com>
Date:   Mon Apr 27 13:45:07 2009 -0400

    Merge branch 'master' into gdbus

 configure.in                             |   54 ++
 docs/reference/gio/Makefile.am           |    6 +-
 docs/reference/gio/gio-docs.xml          |   12 +
 docs/reference/gio/gio-sections.txt      |  214 +++++
 docs/reference/gio/gio.types             |    9 +
 docs/reference/glib/glib-docs.sgml       |    2 +
 docs/reference/glib/glib-sections.txt    |   13 +
 docs/reference/glib/tmpl/ghostutils.sgml |   64 ++
 gio/Makefile.am                          |   35 +-
 gio/gfileicon.c                          |    4 +-
 gio/ginetaddress.c                       |  755 +++++++++++++++
 gio/ginetaddress.h                       |  101 ++
 gio/ginetsocketaddress.c                 |  306 ++++++
 gio/ginetsocketaddress.h                 |   69 ++
 gio/gio.h                                |    9 +
 gio/gio.symbols                          |  143 +++
 gio/gioenums.h                           |   34 +
 gio/giotypes.h                           |    9 +
 gio/glocalfileinfo.c                     |    2 +-
 gio/gnetworkaddress.c                    |  462 +++++++++
 gio/gnetworkaddress.h                    |   65 ++
 gio/gnetworkingprivate.h                 |   87 ++
 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/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/tests/.gitignore                    |    1 +
 glib/tests/Makefile.am                   |    3 +
 glib/tests/hostutils.c                   |  267 ++++++
 glibconfig.h.win32.in                    |    3 +
 po/ca.po                                 |  922 +++++++++---------
 65 files changed, 11236 insertions(+), 489 deletions(-)