diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2012-09-20 18:52:27 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2012-09-20 18:52:27 -0400 |
| commit | 97f705a3ba001fd8d948d6493c057bdb1c8ee845 (patch) | |
| tree | 99fa3c1109e65881bbdeb95c0f21c0f36d85a294 /farstream | |
| parent | 740ec399f90944d56648367bba914b922f97b4cc (diff) | |
| download | farstream-97f705a3ba001fd8d948d6493c057bdb1c8ee845.tar.gz | |
Add some allow-none annotations
Diffstat (limited to 'farstream')
| -rw-r--r-- | farstream/fs-codec.c | 17 | ||||
| -rw-r--r-- | farstream/fs-session.c | 6 |
2 files changed, 13 insertions, 10 deletions
diff --git a/farstream/fs-codec.c b/farstream/fs-codec.c index 8b78d546..abc81b70 100644 --- a/farstream/fs-codec.c +++ b/farstream/fs-codec.c @@ -660,8 +660,8 @@ fs_codec_are_equal (const FsCodec *codec1, const FsCodec *codec2) /** * fs_codec_list_are_equal: - * @list1: (element-type FsCodec): a #GList of #FsCodec - * @list2: (element-type FsCodec): a #GList of #FsCodec + * @list1: (element-type FsCodec) (allow-none): a #GList of #FsCodec + * @list2: (element-type FsCodec) (allow-none): a #GList of #FsCodec * * Verifies if two glist of fscodecs are identical * @@ -739,7 +739,8 @@ fs_codec_remove_optional_parameter (FsCodec *codec, * fs_codec_get_optional_parameter: * @codec: a #FsCodec * @name: The name of the parameter to search for - * @value: The value of the parameter to search for or %NULL for any value + * @value: (allow-none): The value of the parameter to search for or %NULL for + * any value * * Finds the #FsCodecParameter in the #FsCodec that has the requested name * and, if not %NULL, the requested value @@ -802,10 +803,12 @@ fs_codec_add_feedback_parameter (FsCodec *codec, const gchar *type, /** * fs_codec_get_feedback_parameter: * @codec: a #FsCodec - * @type: The subtype of the parameter to search for or %NULL for any type - * @subtype: The subtype of the parameter to search for or %NULL for any subtype - * @extra_params: The extra_params of the parameter to search for or %NULL for - * any extra_params + * @type: (allow-none): The subtype of the parameter to search for or %NULL for + * any type + * @subtype: (allow-none): The subtype of the parameter to search for or %NULL + * for any subtype + * @extra_params: (allow-none): The extra_params of the parameter to search for + * or %NULL for any extra_params * * Finds the #FsFeedbackParameter in the #FsCodec that has the requested * subtype, type and extra_params. One of which must be non-NULL; diff --git a/farstream/fs-session.c b/farstream/fs-session.c index ec5fa73d..f31ae494 100644 --- a/farstream/fs-session.c +++ b/farstream/fs-session.c @@ -598,7 +598,7 @@ fs_session_set_send_codec (FsSession *session, FsCodec *send_codec, /** * fs_session_set_codec_preferences: * @session: a #FsSession - * @codec_preferences: (element-type FsCodec): a #GList of #FsCodec with the + * @codec_preferences: (element-type FsCodec) (allow-none): a #GList of #FsCodec with the * desired configuration * @error: location of a #GError, or %NULL if no error occured * @@ -715,9 +715,9 @@ fs_session_get_stream_transmitter_type (FsSession *session, /** * fs_session_codecs_need_resend: * @session: a #FsSession - * @old_codecs: (element-type FsCodec) (transfer none): + * @old_codecs: (element-type FsCodec) (transfer none) (allow-none): * Codecs previously retrieved from the #FsSession:codecs property - * @new_codecs: (element-type FsCodec) (transfer none): + * @new_codecs: (element-type FsCodec) (transfer none) (allow-none): * Codecs recently retrieved from the #FsSession:codecs property * * Some codec updates need to be reliably transmitted to the other side |