summaryrefslogtreecommitdiff
path: root/gir
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2013-12-11 15:13:42 +0100
committerMartin Pitt <martinpitt@gnome.org>2013-12-11 15:13:42 +0100
commitc1f22aa7ee718217b465d362235948272a09d677 (patch)
treec0dc28e33eb6cb3647983f38107c3621da5ea280 /gir
parentd355a386f8f03bdfacf6b48a8fccb0a4218cc4fa (diff)
downloadgobject-introspection-c1f22aa7ee718217b465d362235948272a09d677.tar.gz
Update glib annotations from git master
Diffstat (limited to 'gir')
-rw-r--r--gir/gio-2.0.c12
-rw-r--r--gir/glib-2.0.c5
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
*/