[glib/tls-database: 37/37] Merge branch 'master' into tls-database

[Stefan Walter <stefw src gnome org>]

commit 6b2df11ca962801f36583834db4b15a42a120c88
Merge: bc0bb77 4e33967
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Jan 6 07:04:23 2011 -0800

    Merge branch 'master' into tls-database

 Makefile.decl                                      |   18 +-
 build/win32/vs9/glib.vsprops                       |    9 +-
 gio/gaction.c                                      |    9 +-
 gio/gappinfo.c                                     |    4 +-
 gio/gappinfo.h                                     |    2 +-
 gio/gcancellable.c                                 |    6 +-
 gio/gcontenttype.c                                 |    4 +-
 gio/gconverter.c                                   |    7 +-
 gio/gdesktopappinfo.c                              |  181 +++-
 gio/gdesktopappinfo.h                              |   24 +
 gio/gemblem.c                                      |    6 +-
 gio/gemblemedicon.c                                |    4 +-
 gio/gfileenumerator.c                              |   16 +-
 gio/gfileenumerator.h                              |    4 +-
 gio/gicon.c                                        |    4 +-
 gio/ginetaddress.c                                 |    2 +-
 gio/ginetsocketaddress.c                           |    2 +-
 gio/gloadableicon.c                                |   12 +-
 gio/gmemoryinputstream.c                           |    8 +-
 gio/gmemoryoutputstream.c                          |   12 +-
 gio/gpollableinputstream.c                         |   13 +-
 gio/gpollableoutputstream.c                        |   12 +-
 gio/gproxy.c                                       |   11 +-
 gio/gproxyaddress.c                                |    6 +-
 gio/gproxyresolver.c                               |   18 +-
 gio/gresolver.c                                    |   24 +-
 gio/gseekable.c                                    |    4 +-
 gio/gsocket.c                                      |   48 +-
 gio/gsocketaddressenumerator.c                     |    9 +-
 gio/gsocketclient.c                                |   32 +-
 gio/gsocketcontrolmessage.c                        |    2 +-
 gio/gsocketlistener.c                              |   28 +-
 gio/gthemedicon.c                                  |    2 +-
 gio/gtlsclientconnection.c                         |   26 +-
 gio/gtlsclientconnection.h                         |    2 +-
 gio/gunixconnection.c                              |    4 +-
 gio/gunixfdlist.c                                  |   14 +-
 gio/gunixfdmessage.c                               |    6 +-
 gio/gunixsocketaddress.c                           |    4 +-
 gio/tests/desktop-app-info.c                       |    2 +-
 glib/gfileutils.c                                  |    2 +-
 glib/giochannel.c                                  |   37 +-
 glib/gtester-report                                |    5 +
 glib/gvariant.c                                    |    3 +
 gobject/gobject.c                                  |  116 +-
 gobject/gparam.c                                   |   39 +-
 gobject/gparamspecs.c                              |   46 +-
 gobject/gtype.c                                    |  108 +-
 gobject/tests/Makefile.am                          |   14 +-
 {tests/gobject => gobject/tests}/ifaceproperties.c |  379 ++++--
 gobject/tests/testcommon.h                         |  100 ++
 po/nb.po                                           |  216 ++--
 po/sv.po                                           | 1405 +++++++++++---------
 po/zh_CN.po                                        |  251 ++--
 tests/gobject/Makefile.am                          |    1 -
 tests/testglib.c                                   |    6 +-
 56 files changed, 1985 insertions(+), 1344 deletions(-)
---