Imported Upstream version 1.70.0upstream/1.70.0upstream

5 files changed, 64 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 1c564c43..59a2df40 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+1.70.0 - 2021-09-17
+-------------------
+
+* Update the GIR data for GLib, GObject, and GIO
+
 1.69.0 - 2021-08-24
 -------------------
 
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index eec568cf..956fed09 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -33887,10 +33887,10 @@
  * @key: a #GSettingsSchemaKey
  * @value: the value to check
  *
- * Checks if the given @value is of the correct type and within the
+ * Checks if the given @value is within the
  * permitted range for @key.
  *
- * It is a programmer error if @value is not of the correct type -- you
+ * It is a programmer error if @value is not of the correct type — you
  * must check for this first.
  *
  * Returns: %TRUE if @value is valid for @key
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 5ea15d63..2d2810ea 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -4661,6 +4661,9 @@
  * In order to use this function, you must include string.h yourself,
  * because this macro may use memmove() and GLib does not include
  * string.h for you.
+ *
+ * Each invocation of `G_VA_COPY (ap1, ap2)` must be matched with a
+ * corresponding `va_end (ap1)` call in the same function.
  */
 
 
@@ -32526,18 +32529,18 @@
 
 
 /**
- * g_string_new:
+ * g_string_new: (constructor)
  * @init: (nullable): the initial text to copy into the string, or %NULL to
- * start with an empty string
+ *   start with an empty string
  *
  * Creates a new #GString, initialized with the given string.
  *
- * Returns: the new #GString
+ * Returns: (transfer full): the new #GString
  */
 
 
 /**
- * g_string_new_len:
+ * g_string_new_len: (constructor)
  * @init: initial contents of the string
  * @len: length of @init to use
  *
@@ -32549,7 +32552,7 @@
  * responsibility to ensure that @init has at least @len addressable
  * bytes.
  *
- * Returns: a new #GString
+ * Returns: (transfer full): a new #GString
  */
 
 
@@ -32690,16 +32693,15 @@
 
 
 /**
- * g_string_sized_new:
- * @dfl_size: the default size of the space allocated to
- *     hold the string
+ * g_string_sized_new: (constructor)
+ * @dfl_size: the default size of the space allocated to hold the string
  *
  * Creates a new #GString, with enough space for @dfl_size
  * bytes. This is useful if you are going to add a lot of
  * text to the string and don't want it to be reallocated
  * too often.
  *
- * Returns: the new #GString
+ * Returns: (transfer full): the new #GString
  */
 
 
@@ -33511,11 +33513,29 @@
  *
  * If not called from inside a test, this function does nothing.
  *
+ * Note that unlike g_test_skip() and g_test_incomplete(), this
+ * function does not log a message alongside the test failure.
+ * If details of the test failure are available, either log them with
+ * g_test_message() before g_test_fail(), or use g_test_fail_printf()
+ * instead.
+ *
  * Since: 2.30
  */
 
 
 /**
+ * g_test_fail_printf:
+ * @format: the format string
+ * @...: printf-like arguments to @format
+ *
+ * Equivalent to g_test_fail(), but also record a message like
+ * g_test_skip_printf().
+ *
+ * Since: 2.70
+ */
+
+
+/**
  * g_test_failed:
  *
  * Returns whether a test has already failed. This will
@@ -33618,6 +33638,18 @@
 
 
 /**
+ * g_test_incomplete_printf:
+ * @format: the format string
+ * @...: printf-like arguments to @format
+ *
+ * Equivalent to g_test_incomplete(), but the explanation is formatted
+ * as if by g_strdup_printf().
+ *
+ * Since: 2.70
+ */
+
+
+/**
  * g_test_init:
  * @argc: Address of the @argc parameter of the main() function.
  *        Changed if any arguments were handled.
@@ -34037,6 +34069,18 @@
 
 
 /**
+ * g_test_skip_printf:
+ * @format: the format string
+ * @...: printf-like arguments to @format
+ *
+ * Equivalent to g_test_skip(), but the explanation is formatted
+ * as if by g_strdup_printf().
+ *
+ * Since: 2.70
+ */
+
+
+/**
  * g_test_slow:
  *
  * Returns %TRUE if tests are run in slow mode.
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index 93a4c7d3..8bfce427 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -2033,7 +2033,7 @@
 /**
  * g_closure_invoke:
  * @closure: a #GClosure
- * @return_value: (optional) (inout): a #GValue to store the return
+ * @return_value: (optional) (out): a #GValue to store the return
  *                value. May be %NULL if the callback of @closure
  *                doesn't return a value.
  * @n_param_values: the length of the @param_values array
@@ -4686,7 +4686,8 @@
  * @detailed_signal: a string of the form "signal-name::detail".
  * @...: parameters to be passed to the signal, followed by a
  *  location for the return value. If the return type of the signal
- *  is #G_TYPE_NONE, the return value location can be omitted.
+ *  is %G_TYPE_NONE, the return value location can be omitted. The
+ *  number of parameters to pass to this function is defined when creating the signal.
  *
  * Emits a signal.
  *
diff --git a/meson.build b/meson.build
index 691863a7..c2cb577f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gobject-introspection', 'c',
-  version: '1.69.0',
+  version: '1.70.0',
   meson_version: '>= 0.55.3',
   default_options: [
     'warning_level=2',