summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2014-11-30 20:56:01 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2014-11-30 20:56:01 +0100
commit3bdfc7449be8307dd8c43a1d8034375b4f16dafb (patch)
tree02b529e18266628eced9443fc3e1a9000548d659
parent1a4de48da8e9c20d99b8136c31c8ae6cd17c6ebc (diff)
downloadgobject-introspection-3bdfc7449be8307dd8c43a1d8034375b4f16dafb.tar.gz
Update glib annotations from git master
-rw-r--r--gir/gio-2.0.c53
-rw-r--r--gir/glib-2.0.c18
-rw-r--r--gir/gobject-2.0.c6
3 files changed, 70 insertions, 7 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 076ad488..9123418f 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -2887,11 +2887,16 @@
/**
* 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
*/
@@ -6417,6 +6422,16 @@
* the names must begin with a lowercase character, must not end
* with a '-', and must not contain consecutive dashes.
*
+ * GSettings supports change notification. The primary mechanism to
+ * watch for changes is to connect to the "changed" signal. You can
+ * optionally watch for changes on only a single key by using a signal
+ * detail. Signals are only guaranteed to be emitted for a given key
+ * after you have read the value of that key while a signal handler was
+ * connected for that key. Signals may or may not be emitted in the
+ * case that the key "changed" to the value that you had previously
+ * read. Signals may be reported in additional cases as well and the
+ * "changed" signal should really be treated as "may have changed".
+ *
* Similar to GConf, the default values in GSettings schemas can be
* localized, but the localized values are stored in gettext catalogs
* and looked up with the domain that is specified in the
@@ -27175,12 +27190,40 @@
* Creates a new #GSocketConnectable for connecting to the given
* @hostname and @port.
*
+ * Note that depending on the configuration of the machine, a
+ * @hostname of `localhost` may refer to the IPv4 loopback address
+ * only, or to both IPv4 and IPv6; use
+ * g_network_address_new_loopback() to create a #GNetworkAddress that
+ * is guaranteed to resolve to both addresses.
+ *
* Returns: (transfer full) (type GNetworkAddress): the new #GNetworkAddress
* Since: 2.22
*/
/**
+ * g_network_address_new_loopback:
+ * @port: the port
+ *
+ * Creates a new #GSocketConnectable for connecting to the local host
+ * over a loopback connection to the given @port. This is intended for
+ * use in connecting to local services which may be running on IPv4 or
+ * IPv6.
+ *
+ * The connectable will return IPv4 and IPv6 loopback addresses,
+ * regardless of how the host resolves `localhost`. By contrast,
+ * g_network_address_new() will often only return an IPv4 address when
+ * resolving `localhost`, and an IPv6 address for `localhost6`.
+ *
+ * g_network_address_get_hostname() will always return `localhost` for
+ * #GNetworkAddresses created with this constructor.
+ *
+ * Returns: (transfer full) (type GNetworkAddress): the new #GNetworkAddress
+ * Since: 2.44
+ */
+
+
+/**
* g_network_address_parse:
* @host_and_port: the hostname and optionally a port
* @default_port: the default port if not in @host_and_port
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 287f39d3..7d8a5833 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -27231,8 +27231,10 @@
* g_strfreev:
* @str_array: a %NULL-terminated array of strings to free
*
- * Frees a %NULL-terminated array of strings, and the array itself.
- * If called on a %NULL value, g_strfreev() simply returns.
+ * Frees a %NULL-terminated array of strings, as well as each
+ * string it contains.
+ *
+ * If @str_array is %NULL, this function simply returns.
*/
@@ -28182,6 +28184,18 @@
/**
+ * g_strv_contains:
+ * @strv: a %NULL-terminated array of strings
+ * @str: a string
+ *
+ * Checks if @strv contains @str. @strv must not be %NULL.
+ *
+ * Returns: %TRUE if @str is an element of @strv, according to g_str_equal().
+ * Since: 2.44
+ */
+
+
+/**
* g_strv_length:
* @str_array: a %NULL-terminated array of strings
*
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index 344b4a36..c07d98a4 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -3948,6 +3948,12 @@
* Returns whether there are any handlers connected to @instance for the
* given signal id and detail.
*
+ * If @detail is 0 then it will only match handlers that were connected
+ * without detail. If @detail is non-zero then it will match handlers
+ * connected both without detail and with the given detail. This is
+ * consistent with how a signal emitted with @detail would be delivered
+ * to those handlers.
+ *
* One example of when you might use this is when the arguments to the
* signal are difficult to compute. A class implementor may opt to not
* emit the signal if no one is attached anyway, thus saving the cost