diff options
| author | Christian Hergert <chergert@redhat.com> | 2016-10-28 18:29:02 -0700 |
|---|---|---|
| committer | Christian Hergert <chergert@redhat.com> | 2016-11-22 14:14:37 -0800 |
| commit | 18a33f72db6a410606674d8d53fb2dadb706091d (patch) | |
| tree | d12312302fad79c562f796d250ede4b58c2e0b01 /gio/gactiongroup.c | |
| parent | a4012abbdf2c6c095ae34a97dca760b2446436aa (diff) | |
| download | glib-18a33f72db6a410606674d8d53fb2dadb706091d.tar.gz | |
introspection: use (nullable) or (optional) instead of (allow-none)
If we have an input parameter (or return value) we need to use (nullable).
However, if it is an (inout) or (out) parameter, (optional) is sufficient.
It looks like (nullable) could be used for everything according to the
Annotation documentation, but (optional) is more specific.
Diffstat (limited to 'gio/gactiongroup.c')
| -rw-r--r-- | gio/gactiongroup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c index 425a20a03..eef46b4e8 100644 --- a/gio/gactiongroup.c +++ b/gio/gactiongroup.c @@ -573,7 +573,7 @@ g_action_group_change_action_state (GActionGroup *action_group, * g_action_group_activate_action: * @action_group: a #GActionGroup * @action_name: the name of the action to activate - * @parameter: (allow-none): parameters to the activation + * @parameter: (nullable): parameters to the activation * * Activate the named action within @action_group. * @@ -705,10 +705,10 @@ g_action_group_action_state_changed (GActionGroup *action_group, * @action_group: a #GActionGroup * @action_name: the name of an action in the group * @enabled: (out): if the action is presently enabled - * @parameter_type: (out) (allow-none): the parameter type, or %NULL if none needed - * @state_type: (out) (allow-none): the state type, or %NULL if stateless - * @state_hint: (out) (allow-none): the state hint, or %NULL if none - * @state: (out) (allow-none): the current state, or %NULL if stateless + * @parameter_type: (out) (optional): the parameter type, or %NULL if none needed + * @state_type: (out) (optional): the state type, or %NULL if stateless + * @state_hint: (out) (optional): the state hint, or %NULL if none + * @state: (out) (optional): the current state, or %NULL if stateless * * Queries all aspects of the named action within an @action_group. * |