From f8001a6c7e2094de430aa061ec5840e29ef79629 Mon Sep 17 00:00:00 2001 From: Jonathan Matthew Date: Tue, 12 Aug 2014 09:12:56 +1000 Subject: [PATCH] fix some introspection annotation warnings --- lib/rb-debug.c | 4 ++-- lib/rb-file-helpers.c | 4 ++-- lib/rb-util.c | 4 ++-- rhythmdb/rhythmdb-query.c | 4 ++-- rhythmdb/rhythmdb.c | 4 ++-- shell/rb-play-order.c | 2 +- shell/rb-shell-player.c | 8 ++++---- shell/rb-shell.c | 2 +- widgets/rb-entry-view.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/rb-debug.c b/lib/rb-debug.c index 7f76de8b5..dac751645 100644 --- a/lib/rb-debug.c +++ b/lib/rb-debug.c @@ -81,7 +81,7 @@ rb_debug_matches (const char *func, /** * rb_debug: - * @Varargs: printf-style format string followed by any substitution values + * @...: printf-style format string followed by any substitution values * * If the call site function or file name matches the current debug output * settings, the message will be formatted and printed to standard error, @@ -129,7 +129,7 @@ rb_debug_real (const char *func, const char *file, const int line, gboolean newl * @line: line number * @newline: if TRUE, add a newline to the output * @format: printf style format specifier - * @Varargs: substitution values for @format + * @...: substitution values for @format * * If the debug output settings match the function or file names, * the debug message will be formatted and written to standard error. diff --git a/lib/rb-file-helpers.c b/lib/rb-file-helpers.c index 68eefb657..70dc178ed 100644 --- a/lib/rb-file-helpers.c +++ b/lib/rb-file-helpers.c @@ -369,7 +369,7 @@ rb_uri_resolve_symlink (const char *uri, GError **error) * * Attempts to resolve symlinks leading to @file and return a canonical location. * - * Return value: a #GFile representing the canonical location, or NULL on error + * Return value: (transfer full): a #GFile representing the canonical location, or NULL on error */ GFile * rb_file_resolve_symlink (GFile *file, GError **error) @@ -1535,7 +1535,7 @@ rb_sanitize_path_for_msdos_filesystem (char *path) /** * rb_sanitize_uri_for_filesystem: * @uri: a URI to sanitize - * @filesystem: (allow none): a specific filesystem to sanitize for + * @filesystem: (allow-none): a specific filesystem to sanitize for * * Removes characters from @uri that are not allowed by the filesystem * on which it would be stored, or a specific type of filesystem if specified. diff --git a/lib/rb-util.c b/lib/rb-util.c index f25a9a8b7..745a31dc4 100644 --- a/lib/rb-util.c +++ b/lib/rb-util.c @@ -811,7 +811,7 @@ rb_string_list_copy (GList *list) /** * rb_string_list_contains: (skip) - * @list: (element-type utf8) list to check + * @list: (element-type utf8): list to check * @s: string to check for * * Checks if @list contains the string @s. @@ -1118,7 +1118,7 @@ rb_signal_accumulator_boolean_or (GSignalInvocationHint *hint, * rb_value_array_append_data: (skip) * @array: #GArray to append to * @type: #GType of the value being appended - * @Varargs: value to append + * @...: value to append * * Appends a single value to @array, collecting it from @Varargs. */ diff --git a/rhythmdb/rhythmdb-query.c b/rhythmdb/rhythmdb-query.c index 3e7c0758e..986d3fefc 100644 --- a/rhythmdb/rhythmdb-query.c +++ b/rhythmdb/rhythmdb-query.c @@ -169,7 +169,7 @@ rhythmdb_query_parse_valist (RhythmDB *db, va_list args) /** * rhythmdb_query_parse: * @db: a #RhythmDB instance - * @Varargs: query criteria to parse + * @...: query criteria to parse * * Creates a query from a list of criteria. * @@ -228,7 +228,7 @@ rhythmdb_query_parse (RhythmDB *db, ...) * rhythmdb_query_append: * @db: a #RhythmDB instance * @query: a query. - * @Varargs: query criteria to append + * @...: query criteria to append * * Appends new criteria to the query @query. * diff --git a/rhythmdb/rhythmdb.c b/rhythmdb/rhythmdb.c index a37233f7f..2a0c33c83 100644 --- a/rhythmdb/rhythmdb.c +++ b/rhythmdb/rhythmdb.c @@ -4112,7 +4112,7 @@ rhythmdb_do_full_query_async_parsed (RhythmDB *db, * rhythmdb_do_full_query_async: * @db: the #RhythmDB * @results: a #RhythmDBQueryResults to feed results to - * @Varargs: query parameters + * @...: query parameters * * Asynchronously runs a query specified in the function arguments * across the database, feeding matching entries to @results in chunks. @@ -4186,7 +4186,7 @@ rhythmdb_do_full_query_parsed (RhythmDB *db, * rhythmdb_do_full_query: * @db: the #RhythmDB * @results: a #RhythmDBQueryResults instance to feed results to - * @Varargs: query parameters + * @...: query parameters * * Synchronously evaluates @query, feeding results to @results in * chunks. Does not return until the query is complete. diff --git a/shell/rb-play-order.c b/shell/rb-play-order.c index a50303bf0..6ede345b5 100644 --- a/shell/rb-play-order.c +++ b/shell/rb-play-order.c @@ -395,7 +395,7 @@ rb_play_order_set_playing_entry (RBPlayOrder *porder, * * Returns the current playing entry in the play order. * - * Returns: (transfer full) playing entry + * Returns: (transfer full): playing entry */ RhythmDBEntry * rb_play_order_get_playing_entry (RBPlayOrder *porder) diff --git a/shell/rb-shell-player.c b/shell/rb-shell-player.c index 4b3c9181b..7ee097557 100644 --- a/shell/rb-shell-player.c +++ b/shell/rb-shell-player.c @@ -173,13 +173,13 @@ static void rb_shell_player_volume_changed_cb (RBPlayer *player, typedef struct { - /** Value of the state/play-order setting */ + /* Value of the state/play-order setting */ char *name; - /** Contents of the play order dropdown; should be gettext()ed before use. */ + /* Contents of the play order dropdown; should be gettext()ed before use. */ char *description; - /** the play order's gtype id */ + /* the play order's gtype id */ GType order_type; - /** TRUE if the play order should appear in the dropdown */ + /* TRUE if the play order should appear in the dropdown */ gboolean is_in_dropdown; } RBPlayOrderDescription; diff --git a/shell/rb-shell.c b/shell/rb-shell.c index e7d1645a0..b3ea9b5fd 100644 --- a/shell/rb-shell.c +++ b/shell/rb-shell.c @@ -3131,7 +3131,7 @@ rb_shell_activate_source_by_uri (RBShell *shell, * rb_shell_get_song_properties: * @shell: the #RBShell * @uri: the URI to query - * @properties: (out callee-allocates) (element-type utf8 GObject.Value) returns the properties of the specified URI + * @properties: (out callee-allocates) (element-type utf8 GObject.Value): returns the properties of the specified URI * @error: returns error information * * Gathers and returns all metadata (including extra metadata such as album diff --git a/widgets/rb-entry-view.c b/widgets/rb-entry-view.c index e0c85c6ea..75bff198e 100644 --- a/widgets/rb-entry-view.c +++ b/widgets/rb-entry-view.c @@ -1192,7 +1192,7 @@ rb_entry_view_set_sorting_type (RBEntryView *view, * rb_entry_view_get_sorting_order: * @view: a #RBEntryView * @column_name: (out callee-allocates) (allow-none) (transfer full): returns the sort column name - * @sort_order: (out) (allow-none) returns the sort ordering as a #GtkSortType value + * @sort_order: (out) (allow-none): returns the sort ordering as a #GtkSortType value * * Retrieves the sort settings for the view. */