Skip to content

Commit

Permalink
fix some introspection annotation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Matthew committed Aug 11, 2014
1 parent af586cb commit f8001a6
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions lib/rb-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/rb-file-helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/rb-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
*/
Expand Down
4 changes: 2 additions & 2 deletions rhythmdb/rhythmdb-query.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.
*
Expand Down
4 changes: 2 additions & 2 deletions rhythmdb/rhythmdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion shell/rb-play-order.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions shell/rb-shell-player.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion shell/rb-shell.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion widgets/rb-entry-view.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit f8001a6

Please sign in to comment.