From 9ec74d20a7e89344fecfc7f994168ea30a6b8c5f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 7 Jun 2016 19:31:56 +0200 Subject: [PATCH] Partly revert "gio: Add filename type annotations" Revert all annotation changes for environment variables and command line arguments. See commit f8189ddf9869ed8e90f9b640d9545fe4011adb7d. --- gio/gappinfo.c | 10 +++++----- gio/gapplication.c | 3 +-- gio/gapplicationcommandline.c | 12 ++++++------ gio/gdesktopappinfo.c | 2 +- gio/gfile.c | 4 ++-- gio/gsubprocess.c | 2 +- gio/gsubprocesslauncher.c | 18 +++++++----------- 7 files changed, 23 insertions(+), 28 deletions(-) diff --git a/gio/gappinfo.c b/gio/gappinfo.c index 01c5d09c2..bfcc85b96 100644 --- a/gio/gappinfo.c +++ b/gio/gappinfo.c @@ -877,8 +877,8 @@ g_app_launch_context_init (GAppLaunchContext *context) /** * g_app_launch_context_setenv: * @context: a #GAppLaunchContext - * @variable: (type filename): the environment variable to set - * @value: (type filename): the value for to set the variable to. + * @variable: the environment variable to set + * @value: the value for to set the variable to. * * Arranges for @variable to be set to @value in the child's * environment when @context is used to launch an application. @@ -900,7 +900,7 @@ g_app_launch_context_setenv (GAppLaunchContext *context, /** * g_app_launch_context_unsetenv: * @context: a #GAppLaunchContext - * @variable: (type filename): the environment variable to remove + * @variable: the environment variable to remove * * Arranges for @variable to be unset in the child's environment * when @context is used to launch an application. @@ -927,8 +927,8 @@ g_app_launch_context_unsetenv (GAppLaunchContext *context, * This is a %NULL-terminated array of strings, where each string has * the form `KEY=VALUE`. * - * Returns: (array zero-terminated=1) (element-type filename) (transfer full): - * the child's environment + * Returns: (array zero-terminated=1) (transfer full): the + * child's environment * * Since: 2.32 */ diff --git a/gio/gapplication.c b/gio/gapplication.c index 9909a44b5..f0af77b0b 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -2198,8 +2198,7 @@ g_application_open (GApplication *application, * g_application_run: * @application: a #GApplication * @argc: the argc from main() (or 0 if @argv is %NULL) - * @argv: (array length=argc) (element-type filename) (allow-none): - * the argv from main(), or %NULL + * @argv: (array length=argc) (allow-none): the argv from main(), or %NULL * * Runs the application. * diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c index 151ec5852..2c6718761 100644 --- a/gio/gapplicationcommandline.c +++ b/gio/gapplicationcommandline.c @@ -463,8 +463,8 @@ g_application_command_line_class_init (GApplicationCommandLineClass *class) * The return value is %NULL-terminated and should be freed using * g_strfreev(). * - * Returns: (array length=argc) (element-type filename) (transfer full) - * the string array containing the arguments (the argv) + * Returns: (array length=argc) (transfer full): the string array + * containing the arguments (the argv) * * Since: 2.28 **/ @@ -582,8 +582,8 @@ g_application_command_line_get_cwd (GApplicationCommandLine *cmdline) * See g_application_command_line_getenv() if you are only interested * in the value of a single environment variable. * - * Returns: (array zero-terminated=1) (element-type filename) (transfer none): - * the environment strings, or %NULL if they were not sent + * Returns: (array zero-terminated=1) (transfer none): the environment + * strings, or %NULL if they were not sent * * Since: 2.28 **/ @@ -596,7 +596,7 @@ g_application_command_line_get_environ (GApplicationCommandLine *cmdline) /** * g_application_command_line_getenv: * @cmdline: a #GApplicationCommandLine - * @name: (type filename): the environment variable to get + * @name: the environment variable to get * * Gets the value of a particular environment variable of the command * line invocation, as would be returned by g_getenv(). The strings may @@ -805,7 +805,7 @@ g_application_command_line_get_platform_data (GApplicationCommandLine *cmdline) /** * g_application_command_line_create_file_for_arg: * @cmdline: a #GApplicationCommandLine - * @arg: (type filename): an argument from @cmdline + * @arg: an argument from @cmdline * * Creates a #GFile corresponding to a filename that was given as part * of the invocation of @cmdline. diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 6318cbc6d..f45328e4f 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -3676,7 +3676,7 @@ g_desktop_app_info_delete (GAppInfo *appinfo) /* Create for commandline {{{2 */ /** * g_app_info_create_from_commandline: - * @commandline: (type filename): the commandline to use + * @commandline: the commandline to use * @application_name: (allow-none): the application name, or %NULL to use @commandline * @flags: flags that can specify details of the created #GAppInfo * @error: a #GError location to store the error occurring, %NULL to ignore. diff --git a/gio/gfile.c b/gio/gfile.c index 9a5a66175..6226e360c 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -6483,7 +6483,7 @@ new_for_cmdline_arg (const gchar *arg, /** * g_file_new_for_commandline_arg: - * @arg: (type filename): a command line string + * @arg: a command line string * * Creates a #GFile with the given argument from the command line. * The value of @arg can be either a URI, an absolute path or a @@ -6513,7 +6513,7 @@ g_file_new_for_commandline_arg (const char *arg) /** * g_file_new_for_commandline_arg_and_cwd: - * @arg: (type filename): a command line string + * @arg: a command line string * @cwd: (type filename): the current working directory of the commandline * * Creates a #GFile with the given argument from the command line. diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c index cd88eb890..170e7e71f 100644 --- a/gio/gsubprocess.c +++ b/gio/gsubprocess.c @@ -697,7 +697,7 @@ g_subprocess_new (GSubprocessFlags flags, /** * g_subprocess_newv: (rename-to g_subprocess_new) - * @argv: (array zero-terminated=1) (element-type filename): commandline arguments for the subprocess + * @argv: (array zero-terminated=1) (element-type utf8): commandline arguments for the subprocess * @flags: flags that define the behaviour of the subprocess * @error: (allow-none): return location for an error, or %NULL * diff --git a/gio/gsubprocesslauncher.c b/gio/gsubprocesslauncher.c index 75a5cd6f0..340e002ec 100644 --- a/gio/gsubprocesslauncher.c +++ b/gio/gsubprocesslauncher.c @@ -225,8 +225,7 @@ g_subprocess_launcher_new (GSubprocessFlags flags) /** * g_subprocess_launcher_set_environ: * @self: a #GSubprocess - * @env: (array zero-terminated=1) (element-type filename) (nullable) (transfer none): - * the replacement environment + * @env: the replacement environment * * Replace the entire environment of processes launched from this * launcher with the given 'environ' variable. @@ -254,9 +253,8 @@ g_subprocess_launcher_set_environ (GSubprocessLauncher *self, /** * g_subprocess_launcher_setenv: * @self: a #GSubprocess - * @variable: (type filename): the environment variable to set, - * must not contain '=' - * @value: (type filename): the new value for the variable + * @variable: the environment variable to set, must not contain '=' + * @value: the new value for the variable * @overwrite: whether to change the variable if it already exists * * Sets the environment variable @variable in the environment of @@ -280,8 +278,7 @@ g_subprocess_launcher_setenv (GSubprocessLauncher *self, /** * g_subprocess_launcher_unsetenv: * @self: a #GSubprocess - * @variable: (type filename): the environment variable to unset, - * must not contain '=' + * @variable: the environment variable to unset, must not contain '=' * * Removes the environment variable @variable from the environment of * processes launched from this launcher. @@ -301,7 +298,7 @@ g_subprocess_launcher_unsetenv (GSubprocessLauncher *self, /** * g_subprocess_launcher_getenv: * @self: a #GSubprocess - * @variable: (type filename): the environment variable to get + * @variable: the environment variable to get * * Returns the value of the environment variable @variable in the * environment of processes launched from this launcher. @@ -309,8 +306,7 @@ g_subprocess_launcher_unsetenv (GSubprocessLauncher *self, * On UNIX, the returned string can be an arbitrary byte string. * On Windows, it will be UTF-8. * - * Returns: (type filename): the value of the environment variable, - * %NULL if unset + * Returns: the value of the environment variable, %NULL if unset * * Since: 2.40 **/ @@ -715,7 +711,7 @@ g_subprocess_launcher_spawn (GSubprocessLauncher *launcher, /** * g_subprocess_launcher_spawnv: * @self: a #GSubprocessLauncher - * @argv: (array zero-terminated=1) (element-type filename): Command line arguments + * @argv: (array zero-terminated=1) (element-type utf8): Command line arguments * @error: Error * * Creates a #GSubprocess given a provided array of arguments. -- 2.11.4.GIT