From b49b5679e354bdfe96460443367f886b20c8ce0f Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 20 Nov 2016 18:15:33 +0100 Subject: gir: Update annotations from GLib git master --- gir/glib-2.0.c | 3 ++- gir/gobject-2.0.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 7c8f82f7..f22e299c 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -9221,7 +9221,8 @@ * an error message is logged and the application is terminated. * * The macro can be turned off in final releases of code by defining - * `G_DISABLE_ASSERT` when compiling the application. + * `G_DISABLE_ASSERT` when compiling the application, so code must + * not depend on any side effects from @expr. */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index dd4454c1..dfca0326 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -4295,7 +4295,7 @@ * * Connects a closure to a signal for a particular object. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID (always greater than 0 for successful connections) */ @@ -4310,7 +4310,7 @@ * * Connects a closure to a signal for a particular object. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID (always greater than 0 for successful connections) */ @@ -4329,7 +4329,7 @@ * used. Specify @connect_flags if you need `..._after()` or * `..._swapped()` variants of this function. * - * Returns: the handler id (always greater than 0 for successful connections) + * Returns: the handler ID (always greater than 0 for successful connections) */ @@ -4485,9 +4485,9 @@ /** * g_signal_handler_is_connected: * @instance: (type GObject.Object): The instance where a signal handler is sought. - * @handler_id: the handler id. + * @handler_id: the handler ID. * - * Returns whether @handler_id is the id of a handler connected to @instance. + * Returns whether @handler_id is the ID of a handler connected to @instance. * * Returns: whether @handler_id identifies a handler connected to @instance. */ -- cgit v1.2.1