From 8f20bc5046ed83c73cfa97480c99ba7881799752 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 19 Aug 2013 22:34:16 +0200 Subject: Update annotations from glib git --- gir/gio-2.0.c | 4 ++++ gir/glib-2.0.c | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 0c670b21..064e968c 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -28983,6 +28983,7 @@ * and adding them to the action group. * * Since: 2.30 + * Deprecated: 2.38: Use g_action_map_add_action_entries() */ @@ -28999,6 +29000,7 @@ * The action group takes its own reference on @action. * * Since: 2.28 + * Deprecated: 2.38: Use g_action_map_add_action() */ @@ -29013,6 +29015,7 @@ * * Returns: (transfer none): a #GAction, or %NULL * Since: 2.28 + * Deprecated: 2.38: Use g_action_map_lookup_action() */ @@ -29036,6 +29039,7 @@ * If no action of this name is in the group then nothing happens. * * Since: 2.28 + * Deprecated: 2.38: Use g_action_map_remove_action() */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 3e7f8b6e..e5b73062 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -14813,12 +14813,19 @@ /** * g_get_tmp_dir: * - * Gets the directory to use for temporary files. This is found from - * inspecting the environment variables TMPDIR, - * TMP, and TEMP in that order. If none - * of those are defined "/tmp" is returned on UNIX and "C:\" on Windows. - * The encoding of the returned string is system-defined. On Windows, - * it is always UTF-8. The return value is never %NULL or the empty string. + * Gets the directory to use for temporary files. + * + * On UNIX, this is taken from the TMPDIR environment + * variable. If the variable is not set, P_tmpdir is + * used, as defined by the system C library. Failing that, a hard-coded + * default of "/tmp" is returned. + * + * On Windows, the TEMP environment variable is used, + * with the root directory of the Windows installation (eg: "C:\") used + * as a default. + * + * The encoding of the returned string is system-defined. On Windows, it + * is always UTF-8. The return value is never %NULL or the empty string. * * Returns: the directory to use for temporary files. */ -- cgit v1.2.1