Merge branch 'ricotz/for-master' into 'master'

gtlspassword: Fix g-i annotation of return for g_tls_password_get_value

See merge request GNOME/glib!2023
This commit is contained in:
Philip Withnall 2021-03-31 12:10:10 +00:00
commit 4cce4b96a6

View File

@ -241,9 +241,9 @@ g_tls_password_new (GTlsPasswordFlags flags,
} }
/** /**
* g_tls_password_get_value: * g_tls_password_get_value: (virtual get_value)
* @password: a #GTlsPassword object * @password: a #GTlsPassword object
* @length: (nullable): location to place the length of the password. * @length: (optional): location to place the length of the password.
* *
* Get the password value. If @length is not %NULL then it will be * Get the password value. If @length is not %NULL then it will be
* filled in with the length of the password value. (Note that the * filled in with the length of the password value. (Note that the
@ -251,7 +251,7 @@ g_tls_password_new (GTlsPasswordFlags flags,
* for @length in contexts where you know the password will have a * for @length in contexts where you know the password will have a
* certain fixed length.) * certain fixed length.)
* *
* Returns: The password value (owned by the password object). * Returns: (array length=length): The password value (owned by the password object).
* *
* Since: 2.30 * Since: 2.30
*/ */