From c1f22aa7ee718217b465d362235948272a09d677 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 11 Dec 2013 15:13:42 +0100 Subject: Update glib annotations from git master --- gir/gio-2.0.c | 12 ++++++------ gir/glib-2.0.c | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 0af69ab2..6112e938 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -18457,13 +18457,13 @@ * g_desktop_app_info_launch_uris_as_manager: * @appinfo: a #GDesktopAppInfo * @uris: (element-type utf8): List of URIs - * @launch_context: a #GAppLaunchContext + * @launch_context: (allow-none): a #GAppLaunchContext * @spawn_flags: #GSpawnFlags, used for each process - * @user_setup: (scope call): a #GSpawnChildSetupFunc, used once for - * each process. - * @user_setup_data: (closure user_setup): User data for @user_setup - * @pid_callback: (scope call): Callback for child processes - * @pid_callback_data: (closure pid_callback): User data for @callback + * @user_setup: (scope call) (allow-none): a #GSpawnChildSetupFunc, used once + * for each process. + * @user_setup_data: (closure user_setup) (allow-none): User data for @user_setup + * @pid_callback: (scope call) (allow-none): Callback for child processes + * @pid_callback_data: (closure pid_callback) (allow-none): User data for @callback * @error: return location for a #GError, or %NULL * * This function performs the equivalent of g_app_info_launch_uris(), diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 885afd01..3c3a1a63 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -15112,6 +15112,11 @@ * The encoding of the returned string is system defined. * On Windows, it is always UTF-8. * + * Since GLib 2.40, this function will return the value of the "PWD" + * environment variable if it is set and it happens to be the same as + * the current directory. This can make a difference in the case that + * the current directory is the target of a symbolic link. + * * Returns: the current directory */ -- cgit v1.2.1