diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-01-04 19:50:10 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-01-04 19:50:10 +0100 |
commit | 8678a8a355351fd7b737ba581b92e8346003cb66 (patch) | |
tree | 85cc5484e82538984465c044ecb22cca912bedd2 /gir | |
parent | 802a048819b9d0acb9c004eeba05d74e46170d3d (diff) | |
download | gobject-introspection-8678a8a355351fd7b737ba581b92e8346003cb66.tar.gz |
Update glib annotations from git master
Diffstat (limited to 'gir')
-rw-r--r-- | gir/gio-2.0.c | 2 | ||||
-rw-r--r-- | gir/glib-2.0.c | 43 |
2 files changed, 43 insertions, 2 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index c6d532e5..aa175b21 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -34111,7 +34111,7 @@ /** * g_subprocess_launcher_set_environ: * @self: a #GSubprocess - * @environ: the replacement environment + * @env: the replacement environment * * Replace the entire environment of processes launched from this * launcher with the given 'environ' variable. diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index e8b6e461..61d6b196 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -29203,7 +29203,8 @@ * g_test_run_suite() or g_test_run() may only be called once * in a program. * - * Returns: 0 on success + * Returns: 0 on success, 1 on failure (assuming it returns at all), + * 77 if all tests were skipped with g_test_skip(). * Since: 2.16 */ @@ -34495,6 +34496,46 @@ /** + * g_variant_parse_error_print_context: + * @error: a #GError from the #GVariantParseError domain + * @source_str: the string that was given to the parser + * + * Pretty-prints a message showing the context of a #GVariant parse + * error within the string for which parsing was attempted. + * + * The resulting string is suitable for output to the console or other + * monospace media where newlines are treated in the usual way. + * + * The message will typically look something like one of the following: + * + * |[ + * unterminated string constant: + * (1, 2, 3, 'abc + * ^^^^ + * ]| + * + * or + * + * |[ + * unable to find a common type: + * [1, 2, 3, 'str'] + * ^ ^^^^^ + * ]| + * + * The format of the message may change in a future version. + * + * @error must have come from a failed attempt to g_variant_parse() and + * @source_str must be exactly the same string that caused the error. + * If @source_str was not nul-terminated when you passed it to + * g_variant_parse() then you must add nul termination before using this + * function. + * + * Returns: (transfer full): the printed message + * Since: 2.40 + */ + + +/** * g_variant_print: * @value: a #GVariant * @type_annotate: %TRUE if type information should be included in |