diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-01-11 15:59:14 +0100 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-01-11 15:59:14 +0100 |
| commit | d75842ff4c8c9d78dbd5462409ab2c93600fa9a6 (patch) | |
| tree | 86def8b54a1cb6db27a3bff6c6e6caada203ad13 /gio/gapplication.c | |
| parent | 65bd1f526d86ce08d6fa4d7d6fc1140198c9aef1 (diff) | |
| parent | fabf506b8d5baf8f59fca563e6f1a62be5148112 (diff) | |
| download | glib-wip/gsettings-list.tar.gz | |
Merge branch 'master' into wip/gsettings-listwip/gsettings-list
Diffstat (limited to 'gio/gapplication.c')
| -rw-r--r-- | gio/gapplication.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gio/gapplication.c b/gio/gapplication.c index da9d54d82..6ad23d0f4 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -357,7 +357,7 @@ g_application_set_property (GObject *object, /** * g_application_set_action_group: * @application: a #GApplication - * @action_group: a #GActionGroup, or %NULL + * @action_group: (allow-none): a #GActionGroup, or %NULL * * Sets or unsets the group of actions associated with the application. * @@ -545,7 +545,7 @@ g_application_class_init (GApplicationClass *class) /** * GApplication::open: * @application: the application - * @files: an array of #GFile objects + * @files: (array length=n_files) (element-type GFile): an array of #GFiles * @n_files: the length of @files * @hint: a hint provided by the calling instance * @@ -1047,7 +1047,7 @@ g_application_activate (GApplication *application) /** * g_application_open: * @application: a #GApplication - * @files: an array of #GFiles to open + * @files: (array length=n_files): an array of #GFiles to open * @n_files: the length of the @files array * @hint: a hint (or ""), but never %NULL * @@ -1094,7 +1094,7 @@ g_application_open (GApplication *application, * g_application_run: * @application: a #GApplication * @argc: the argc from main() - * @argv: the argv from main() + * @argv: (array length=argc): the argv from main() * @returns: the exit status * * Runs the application. |