summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Azzarone <andrea.azzarone@canonical.com>2019-03-07 11:12:16 +0000
committerAndrea Azzarone <andrea.azzarone@canonical.com>2019-03-07 11:12:16 +0000
commit912993caae1afd0cabb3218c7a7ee7a92c370ab2 (patch)
tree63bff563f52263681a7dda71bdbbb71e56019265
parent57410eb350741c473b23517fff07841a59ef61e4 (diff)
downloadgobject-introspection-912993caae1afd0cabb3218c7a7ee7a92c370ab2.tar.gz
Update glib annotations
-rw-r--r--gir/gio-2.0.c2
-rw-r--r--gir/glib-2.0.c10
2 files changed, 11 insertions, 1 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index f3f060c9..99fa7a81 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -36094,7 +36094,7 @@
* which may be filled with an array of #GSocketControlMessages, or %NULL
* @num_messages: (out): a pointer which will be filled with the number of
* elements in @messages, or %NULL
- * @flags: (type GSocketMsgFlags): (inout): a pointer to an int containing #GSocketMsgFlags flags
+ * @flags: (type GSocketMsgFlags) (inout): a pointer to an int containing #GSocketMsgFlags flags
* @cancellable: a %GCancellable or %NULL
* @error: a #GError pointer, or %NULL
*
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 8f46e723..efdeeaa0 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -23702,6 +23702,10 @@
* If "[P]roceed" is selected, the function returns.
*
* This function may cause different actions on non-UNIX platforms.
+ *
+ * On Windows consider using the `G_DEBUGGER` environment
+ * variable (see [Running GLib Applications](glib-running.html)) and
+ * calling g_on_error_stack_trace() instead.
*/
@@ -23717,6 +23721,12 @@
* gdk_init().
*
* This function may cause different actions on non-UNIX platforms.
+ *
+ * When running on Windows, this function is *not* called by
+ * g_on_error_query(). If called directly, it will raise an
+ * exception, which will crash the program. If the `G_DEBUGGER` environment
+ * variable is set, a debugger will be invoked to attach and
+ * handle that exception (see [Running GLib Applications](glib-running.html)).
*/