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

[Stefan Walter <stefw src gnome org>]

commit 37603f32c97a64a740753e92722f1f4183122aac
Merge: 6b2df11 8728949
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Jan 17 10:21:36 2011 -0800

    Merge branch 'master' into tls-database

 NEWS                                     |   60 ++
 configure.ac                             |    3 +-
 docs/reference/gio/gio-sections.txt      |    3 +
 docs/reference/glib/glib-sections.txt    |    1 +
 docs/reference/glib/gvariant-varargs.xml |    2 +-
 gio/Makefile.am                          |    2 -
 gio/gapplicationimpl-dbus.c              |    4 +-
 gio/gdesktopappinfo.c                    |   17 +-
 gio/gdesktopappinfo.h                    |   10 +-
 gio/gdrive.c                             |   34 +-
 gio/gdummytlsbackend.c                   |   63 +-
 gio/gio.symbols                          |   18 +-
 gio/giomodule.c                          |    3 +-
 gio/glocalfile.c                         |    2 +
 gio/gmemorysettingsbackend.c             |    9 +-
 gio/gmemorysettingsbackend.h             |   30 -
 gio/gmount.c                             |   33 +-
 gio/gnullsettingsbackend.c               |   25 +-
 gio/gnullsettingsbackend.h               |   30 -
 gio/gschema.dtd                          |   11 +-
 gio/gsettings.c                          |   20 +-
 gio/gsettings.h                          |    5 +-
 gio/gsettingsbackend.c                   |   17 +-
 gio/gsettingsbackend.h                   |    6 +
 gio/gsettingsbackendinternal.h           |    8 +-
 gio/gtlsclientconnection.c               |    4 -
 gio/gunixfdmessage.c                     |    2 +-
 gio/gunixmounts.c                        |   20 +-
 gio/gvolume.c                            |   13 +-
 gio/tests/socket.c                       |  105 ++
 glib/gkeyfile.c                          |   14 +-
 glib/glib.symbols                        |    1 +
 glib/gutils.c                            |   93 ++-
 glib/gutils.h                            |    2 +
 glib/gvariant-core.c                     |    4 +-
 glib/gvariant.c                          |   18 +-
 glib/tests/regex.c                       |    2 +
 glib/tests/utils.c                       |   15 +
 gobject/gobject.c                        |   16 +-
 mkinstalldirs                            |   93 ++-
 po/et.po                                 |  167 ++---
 po/eu.po                                 |  910 +++++++++++-------
 po/gl.po                                 |  386 ++++----
 po/id.po                                 | 1531 +++++++++++++++++-------------
 44 files changed, 2225 insertions(+), 1587 deletions(-)
---
diff --cc gio/gdummytlsbackend.c
index 1135056,f297f74..313c79a
--- a/gio/gdummytlsbackend.c
+++ b/gio/gdummytlsbackend.c
@@@ -195,15 -183,18 +195,19 @@@ enu
  {
    PROP_CONNECTION_0,
  
-   PROP_BASE_IO_STREAM,
-   PROP_REQUIRE_CLOSE_NOTIFY,
-   PROP_REHANDSHAKE_MODE,
-   PROP_DATABASE,
-   PROP_VALIDATION_FLAGS,
-   PROP_SERVER_IDENTITY,
-   PROP_USE_SSL3,
-   PROP_ACCEPTED_CAS,
-   PROP_AUTHENTICATION_MODE
+   PROP_CONN_BASE_IO_STREAM,
+   PROP_CONN_USE_SYSTEM_CERTDB,
++  PROP_CONN_DATABASE,
+   PROP_CONN_REQUIRE_CLOSE_NOTIFY,
+   PROP_CONN_REHANDSHAKE_MODE,
+   PROP_CONN_CERTIFICATE,
+   PROP_CONN_PEER_CERTIFICATE,
+   PROP_CONN_PEER_CERTIFICATE_ERRORS,
+   PROP_CONN_VALIDATION_FLAGS,
+   PROP_CONN_SERVER_IDENTITY,
+   PROP_CONN_USE_SSL3,
+   PROP_CONN_ACCEPTED_CAS,
+   PROP_CONN_AUTHENTICATION_MODE
  };
  
  static void g_dummy_tls_connection_initable_iface_init (GInitableIface *iface);
@@@ -255,15 -246,18 +259,18 @@@ g_dummy_tls_connection_class_init (GDum
     */
    io_stream_class->close_fn = g_dummy_tls_connection_close;
  
-   g_object_class_override_property (gobject_class, PROP_BASE_IO_STREAM, "base-io-stream");
-   g_object_class_override_property (gobject_class, PROP_REQUIRE_CLOSE_NOTIFY, "require-close-notify");
-   g_object_class_override_property (gobject_class, PROP_REHANDSHAKE_MODE, "rehandshake-mode");
-   g_object_class_override_property (gobject_class, PROP_DATABASE, "database");
-   g_object_class_override_property (gobject_class, PROP_VALIDATION_FLAGS, "validation-flags");
-   g_object_class_override_property (gobject_class, PROP_SERVER_IDENTITY, "server-identity");
-   g_object_class_override_property (gobject_class, PROP_USE_SSL3, "use-ssl3");
-   g_object_class_override_property (gobject_class, PROP_ACCEPTED_CAS, "accepted-cas");
-   g_object_class_override_property (gobject_class, PROP_AUTHENTICATION_MODE, "authentication-mode");
+   g_object_class_override_property (gobject_class, PROP_CONN_BASE_IO_STREAM, "base-io-stream");
 -  g_object_class_override_property (gobject_class, PROP_CONN_USE_SYSTEM_CERTDB, "use-system-certdb");
++  g_object_class_override_property (gobject_class, PROP_CONN_DATABASE, "database");
+   g_object_class_override_property (gobject_class, PROP_CONN_REQUIRE_CLOSE_NOTIFY, "require-close-notify");
+   g_object_class_override_property (gobject_class, PROP_CONN_REHANDSHAKE_MODE, "rehandshake-mode");
+   g_object_class_override_property (gobject_class, PROP_CONN_CERTIFICATE, "certificate");
+   g_object_class_override_property (gobject_class, PROP_CONN_PEER_CERTIFICATE, "peer-certificate");
+   g_object_class_override_property (gobject_class, PROP_CONN_PEER_CERTIFICATE_ERRORS, "peer-certificate-errors");
+   g_object_class_override_property (gobject_class, PROP_CONN_VALIDATION_FLAGS, "validation-flags");
+   g_object_class_override_property (gobject_class, PROP_CONN_SERVER_IDENTITY, "server-identity");
+   g_object_class_override_property (gobject_class, PROP_CONN_USE_SSL3, "use-ssl3");
+   g_object_class_override_property (gobject_class, PROP_CONN_ACCEPTED_CAS, "accepted-cas");
+   g_object_class_override_property (gobject_class, PROP_CONN_AUTHENTICATION_MODE, "authentication-mode");
  }
  
  static void