hook gvariant vectors up to kdbus

[platform/upstream/glib.git] / gio / gtlsclientconnection.c

diff --git a/gio/gtlsclientconnection.c b/gio/gtlsclientconnection.c
index 80ede34..e9e1e54 100644 (file)
--- a/gio/gtlsclientconnection.c
+++ b/gio/gtlsclientconnection.c
@@ -103,25 +103,30 @@ g_tls_client_connection_default_init (GTlsClientConnectionInterface *iface)
   /**
    * GTlsClientConnection:use-ssl3:
    *
-   * If %TRUE, tells the connection to use SSL 3.0 rather than trying
-   * to negotiate the best version of TLS or SSL to use. This can be
-   * used when talking to servers that don't implement version
-   * negotiation correctly and therefore refuse to handshake at all with
-   * a "modern" TLS handshake.
+   * If %TRUE, tells the connection to use a fallback version of TLS
+   * or SSL, rather than trying to negotiate the best version of TLS
+   * to use. This can be used when talking to servers that don't
+   * implement version negotiation correctly and therefore refuse to
+   * handshake at all with a "modern" TLS handshake.
+   *
+   * Despite the property name, the fallback version is not
+   * necessarily SSL 3.0; if SSL 3.0 has been disabled, the
+   * #GTlsClientConnection will use the next highest available version
+   * (normally TLS 1.0) as the fallback version.
    *
    * Since: 2.28
    */
   g_object_interface_install_property (iface,
                                       g_param_spec_boolean ("use-ssl3",
-                                                            P_("Use SSL3"),
-                                                            P_("Use SSL 3.0 rather than trying to use TLS 1.x"),
+                                                            P_("Use fallback"),
+                                                            P_("Use fallback version of SSL/TLS rather than most recent version"),
                                                             FALSE,
                                                             G_PARAM_READWRITE |
                                                             G_PARAM_CONSTRUCT |
                                                             G_PARAM_STATIC_STRINGS));
 
   /**
-   * GTlsClientConnection:accepted-cas:
+   * GTlsClientConnection:accepted-cas: (type GLib.List) (element-type GLib.ByteArray):
    *
    * A list of the distinguished names of the Certificate Authorities
    * that the server will accept client certificates signed by. If the
@@ -151,7 +156,7 @@ g_tls_client_connection_default_init (GTlsClientConnectionInterface *iface)
  * must have pollable input and output streams) which is assumed to
  * communicate with the server identified by @server_identity.
  *
- * Return value: (transfer full) (type GTlsClientConnection): the new
+ * Returns: (transfer full) (type GTlsClientConnection): the new
  * #GTlsClientConnection, or %NULL on error
  *
  * Since: 2.28
@@ -179,7 +184,7 @@ g_tls_client_connection_new (GIOStream           *base_io_stream,
  *
  * Gets @conn's validation flags
  *
- * Return value: the validation flags
+ * Returns: the validation flags
  *
  * Since: 2.28
  */
@@ -220,7 +225,7 @@ g_tls_client_connection_set_validation_flags (GTlsClientConnection  *conn,
  *
  * Gets @conn's expected server identity
  *
- * Return value: (transfer none): a #GSocketConnectable describing the
+ * Returns: (transfer none): a #GSocketConnectable describing the
  * expected server identity, or %NULL if the expected identity is not
  * known.
  *
@@ -268,7 +273,7 @@ g_tls_client_connection_set_server_identity (GTlsClientConnection *conn,
  * highest-supported version of TLS; see
  * g_tls_client_connection_set_use_ssl3().
  *
- * Return value: whether @conn will use SSL 3.0
+ * Returns: whether @conn will use SSL 3.0
  *
  * Since: 2.28
  */
@@ -317,7 +322,7 @@ g_tls_client_connection_set_use_ssl3 (GTlsClientConnection *conn,
  * Each item in the list is a #GByteArray which contains the complete
  * subject DN of the certificate authority.
  *
- * Return value: (element-type GByteArray) (transfer full): the list of
+ * Returns: (element-type GByteArray) (transfer full): the list of
  * CA DNs. You should unref each element with g_byte_array_unref() and then
  * the free the list with g_list_free().
  *