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/gtlsinteraction.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/gtlsinteraction.c')
| -rw-r--r-- | gio/gtlsinteraction.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gio/gtlsinteraction.c b/gio/gtlsinteraction.c index 25382379e..75134a211 100644 --- a/gio/gtlsinteraction.c +++ b/gio/gtlsinteraction.c @@ -457,8 +457,8 @@ g_tls_interaction_ask_password (GTlsInteraction *interaction, * @interaction: a #GTlsInteraction object * @password: a #GTlsPassword object * @cancellable: an optional #GCancellable cancellation object - * @callback: (allow-none): will be called when the interaction completes - * @user_data: (allow-none): data to pass to the @callback + * @callback: (nullable): will be called when the interaction completes + * @user_data: (nullable): data to pass to the @callback * * Run asynchronous interaction to ask the user for a password. In general, * g_tls_interaction_invoke_ask_password() should be used instead of this @@ -754,8 +754,8 @@ g_tls_interaction_request_certificate (GTlsInteraction *interaction * @connection: a #GTlsConnection object * @flags: flags providing more information about the request * @cancellable: an optional #GCancellable cancellation object - * @callback: (allow-none): will be called when the interaction completes - * @user_data: (allow-none): data to pass to the @callback + * @callback: (nullable): will be called when the interaction completes + * @user_data: (nullable): data to pass to the @callback * * Run asynchronous interaction to ask the user for a certificate to use with * the connection. In general, g_tls_interaction_invoke_request_certificate() should |