diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-01-13 05:00:12 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-01-13 05:00:12 +0000 |
commit | 75c433fb5f4ca6af0319689cee4f9f6a6b1967b6 (patch) | |
tree | 3453cab4796bbe6e175f804ab9f36176198ca207 /gtk | |
parent | 15c7980ba6b71852635bc928da213696a38eaf9e (diff) | |
parent | 83867f9cbf229c1338d84739a68b318a809d8d2e (diff) | |
download | gtk+-75c433fb5f4ca6af0319689cee4f9f6a6b1967b6.tar.gz |
Merge branch 'closure-annotations' into 'master'
Fix incorrect use of GIR closure annotations.
See merge request GNOME/gtk!1305
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkcontainer.c | 4 | ||||
-rw-r--r-- | gtk/gtkdrawingarea.c | 4 | ||||
-rw-r--r-- | gtk/gtkfilterlistmodel.c | 4 | ||||
-rw-r--r-- | gtk/gtkflowbox.c | 10 | ||||
-rw-r--r-- | gtk/gtkfontchooser.c | 2 | ||||
-rw-r--r-- | gtk/gtklistbox.c | 14 | ||||
-rw-r--r-- | gtk/gtkmaplistmodel.c | 4 | ||||
-rw-r--r-- | gtk/gtkmenubutton.c | 2 | ||||
-rw-r--r-- | gtk/gtkprintjob.c | 2 | ||||
-rw-r--r-- | gtk/gtkprintsettings.c | 2 | ||||
-rw-r--r-- | gtk/gtkscale.c | 2 | ||||
-rw-r--r-- | gtk/gtksortlistmodel.c | 4 | ||||
-rw-r--r-- | gtk/gtktextiter.c | 4 | ||||
-rw-r--r-- | gtk/gtktreelistmodel.c | 2 | ||||
-rw-r--r-- | gtk/gtktreemodel.c | 2 | ||||
-rw-r--r-- | gtk/gtktreesortable.c | 4 | ||||
-rw-r--r-- | gtk/gtktreeview.c | 2 | ||||
-rw-r--r-- | gtk/gtkwidget.c | 4 |
18 files changed, 36 insertions, 36 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index f3813f2b9d..71493d7ef3 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -480,8 +480,8 @@ gtk_container_get_request_mode (GtkWidget *widget) /** * gtk_container_forall: (virtual forall) * @container: a #GtkContainer - * @callback: (scope call) (closure callback_data): a callback - * @callback_data: callback user data + * @callback: (scope call): a callback + * @callback_data: (closure): callback user data * * Invokes @callback on each direct child of @container, including * children that are considered “internal” (implementation details diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index 372a7e413a..f611bf39f4 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -411,9 +411,9 @@ gtk_drawing_area_get_content_height (GtkDrawingArea *self) /** * gtk_drawing_area_set_draw_func: * @self: a #GtkDrawingArea - * @draw_func: (closure user_data) (allow-none): callback that lets you draw + * @draw_func: (allow-none): callback that lets you draw * the drawing area's contents - * @user_data: user data passed to @draw_func + * @user_data: (closure): user data passed to @draw_func * @destroy: destroy notifier for @user_data * * Setting a draw function is the main thing you want to do when using a drawing diff --git a/gtk/gtkfilterlistmodel.c b/gtk/gtkfilterlistmodel.c index 493c893f32..2f5c4dae6d 100644 --- a/gtk/gtkfilterlistmodel.c +++ b/gtk/gtkfilterlistmodel.c @@ -458,7 +458,7 @@ gtk_filter_list_model_augment (GtkRbTree *filter, * gtk_filter_list_model_new: * @model: the model to sort * @filter_func: (allow-none): filter function or %NULL to not filter items - * @user_data: user data passed to @filter_func + * @user_data: (closure): user data passed to @filter_func * @user_destroy: destroy notifier for @user_data * * Creates a new #GtkFilterListModel that will filter @model using the given @@ -511,7 +511,7 @@ gtk_filter_list_model_new_for_type (GType item_type) * gtk_filter_list_model_set_filter_func: * @self: a #GtkFilterListModel * @filter_func: (allow-none): filter function or %NULL to not filter items - * @user_data: user data passed to @filter_func + * @user_data: (closure): user data passed to @filter_func * @user_destroy: destroy notifier for @user_data * * Sets the function used to filter items. The function will be called for every diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c index 05a549a31d..b662946f35 100644 --- a/gtk/gtkflowbox.c +++ b/gtk/gtkflowbox.c @@ -4045,7 +4045,7 @@ gtk_flow_box_check_model_compat (GtkFlowBox *box) * @box: a #GtkFlowBox * @model: (allow-none): the #GListModel to be bound to @box * @create_widget_func: a function that creates widgets for items - * @user_data: user data passed to @create_widget_func + * @user_data: (closure): user data passed to @create_widget_func * @user_data_free_func: function for freeing @user_data * * Binds @model to @box. @@ -4583,9 +4583,9 @@ gtk_flow_box_get_selection_mode (GtkFlowBox *box) /** * gtk_flow_box_set_filter_func: * @box: a #GtkFlowBox - * @filter_func: (closure user_data) (allow-none): callback that + * @filter_func: (allow-none): callback that * lets you filter which children to show - * @user_data: user data passed to @filter_func + * @user_data: (closure): user data passed to @filter_func * @destroy: destroy notifier for @user_data * * By setting a filter function on the @box one can decide dynamically @@ -4663,8 +4663,8 @@ gtk_flow_box_invalidate_filter (GtkFlowBox *box) /** * gtk_flow_box_set_sort_func: * @box: a #GtkFlowBox - * @sort_func: (closure user_data) (allow-none): the sort function - * @user_data: user data passed to @sort_func + * @sort_func: (allow-none): the sort function + * @user_data: (closure): user data passed to @sort_func * @destroy: destroy notifier for @user_data * * By setting a sort function on the @box, one can dynamically diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c index f7e0d20167..35fddc0f56 100644 --- a/gtk/gtkfontchooser.c +++ b/gtk/gtkfontchooser.c @@ -407,7 +407,7 @@ gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser, * gtk_font_chooser_set_filter_func: * @fontchooser: a #GtkFontChooser * @filter: (allow-none): a #GtkFontFilterFunc, or %NULL - * @user_data: data to pass to @filter + * @user_data: (closure): data to pass to @filter * @destroy: function to call to free @data when it is no longer needed * * Adds a filter function that decides which fonts to display diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index c4d9a99545..681c33f3aa 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -1123,8 +1123,8 @@ gtk_list_box_get_selection_mode (GtkListBox *box) /** * gtk_list_box_set_filter_func: * @box: a #GtkListBox - * @filter_func: (closure user_data) (allow-none): callback that lets you filter which rows to show - * @user_data: user data passed to @filter_func + * @filter_func: (allow-none): callback that lets you filter which rows to show + * @user_data: (closure): user data passed to @filter_func * @destroy: destroy notifier for @user_data * * By setting a filter function on the @box one can decide dynamically which @@ -1163,8 +1163,8 @@ gtk_list_box_set_filter_func (GtkListBox *box, /** * gtk_list_box_set_header_func: * @box: a #GtkListBox - * @update_header: (closure user_data) (allow-none): callback that lets you add row headers - * @user_data: user data passed to @update_header + * @update_header: (allow-none): callback that lets you add row headers + * @user_data: (closure): user data passed to @update_header * @destroy: destroy notifier for @user_data * * By setting a header function on the @box one can dynamically add headers @@ -1318,8 +1318,8 @@ gtk_list_box_invalidate_headers (GtkListBox *box) /** * gtk_list_box_set_sort_func: * @box: a #GtkListBox - * @sort_func: (closure user_data) (allow-none): the sort function - * @user_data: user data passed to @sort_func + * @sort_func: (allow-none): the sort function + * @user_data: (closure): user data passed to @sort_func * @destroy: destroy notifier for @user_data * * By setting a sort function on the @box one can dynamically reorder the rows @@ -3581,7 +3581,7 @@ gtk_list_box_check_model_compat (GtkListBox *box) * @model: (nullable): the #GListModel to be bound to @box * @create_widget_func: (nullable): a function that creates widgets for items * or %NULL in case you also passed %NULL as @model - * @user_data: user data passed to @create_widget_func + * @user_data: (closure): user data passed to @create_widget_func * @user_data_free_func: function for freeing @user_data * * Binds @model to @box. diff --git a/gtk/gtkmaplistmodel.c b/gtk/gtkmaplistmodel.c index 7d998d89ff..d30c3eb7a0 100644 --- a/gtk/gtkmaplistmodel.c +++ b/gtk/gtkmaplistmodel.c @@ -424,7 +424,7 @@ gtk_map_list_model_augment (GtkRbTree *map, * @item_type: the #GType to use as the model's item type * @model: (allow-none): The model to map or %NULL for none * @map_func: (allow-none): map function or %NULL to not map items - * @user_data: user data passed to @map_func + * @user_data: (closure): user data passed to @map_func * @user_destroy: destroy notifier for @user_data * * Creates a new #GtkMapListModel for the given arguments. @@ -501,7 +501,7 @@ gtk_map_list_model_init_items (GtkMapListModel *self) * gtk_map_list_model_set_map_func: * @self: a #GtkMapListModel * @map_func: (allow-none): map function or %NULL to not map items - * @user_data: user data passed to @map_func + * @user_data: (closure): user data passed to @map_func * @user_destroy: destroy notifier for @user_data * * Sets the function used to map items. The function will be called whenever diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c index 3427886287..3e0a31a391 100644 --- a/gtk/gtkmenubutton.c +++ b/gtk/gtkmenubutton.c @@ -1035,7 +1035,7 @@ gtk_menu_button_add_child (GtkMenuButton *menu_button, * @func: (nullable): function to call when a popuop is about to * be shown, but none has been provided via other means, or %NULL * to reset to default behavior. - * @user_data: (nullable): user data to pass to @callback + * @user_data: (closure): user data to pass to @func. * @destroy_notify: (nullable): destroy notify for @user_data * * Sets @func to be called when a popup is about to be shown. diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 451d442a3f..f6288364ca 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -693,7 +693,7 @@ gtk_print_job_get_property (GObject *object, * gtk_print_job_send: * @job: a GtkPrintJob * @callback: function to call when the job completes or an error occurs - * @user_data: user data that gets passed to @callback + * @user_data: (closure): user data that gets passed to @callback * @dnotify: destroy notify for @user_data * * Sends the print job off to the printer. diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c index 65104bcd19..5195f52536 100644 --- a/gtk/gtkprintsettings.c +++ b/gtk/gtkprintsettings.c @@ -460,7 +460,7 @@ gtk_print_settings_set_int (GtkPrintSettings *settings, * gtk_print_settings_foreach: * @settings: a #GtkPrintSettings * @func: (scope call): the function to call - * @user_data: user data for @func + * @user_data: (closure): user data for @func * * Calls @func for each key-value pair of @settings. */ diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 4d434ff968..918ecb3bbb 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -2047,7 +2047,7 @@ gtk_scale_buildable_custom_finished (GtkBuildable *buildable, * gtk_scale_set_format_value_func: * @scale: a #GtkScale * @func: (nullable): function that formats the value - * @user_data: (nullable): user data to pass to @func + * @user_data: (closure): user data to pass to @func * @destroy_notify: (nullable): destroy function for @user_data * * @func allows you to change how the scale value is displayed. The given diff --git a/gtk/gtksortlistmodel.c b/gtk/gtksortlistmodel.c index 4a3b09dde3..ac82bb146a 100644 --- a/gtk/gtksortlistmodel.c +++ b/gtk/gtksortlistmodel.c @@ -353,7 +353,7 @@ gtk_sort_list_model_init (GtkSortListModel *self) * gtk_sort_list_model_new: * @model: the model to sort * @sort_func: (allow-none): sort function or %NULL to not sort items - * @user_data: user data passed to @sort_func + * @user_data: (closure): user data passed to @sort_func * @user_destroy: destroy notifier for @user_data * * Creates a new sort list model that uses the @sort_func to sort @model. @@ -417,7 +417,7 @@ gtk_sort_list_model_create_sequences (GtkSortListModel *self) * gtk_sort_list_model_set_sort_func: * @self: a #GtkSortListModel * @sort_func: (allow-none): sort function or %NULL to not sort items - * @user_data: user data passed to @sort_func + * @user_data: (closure): user data passed to @sort_func * @user_destroy: destroy notifier for @user_data * * Sets the function used to sort items. The function will be called for every diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 357b31a8a7..c031c98fa1 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -4326,7 +4326,7 @@ matches_pred (GtkTextIter *iter, * gtk_text_iter_forward_find_char: * @iter: a #GtkTextIter * @pred: (scope call): a function to be called on each character - * @user_data: user data for @pred + * @user_data: (closure): user data for @pred * @limit: (allow-none): search limit, or %NULL for none * * Advances @iter, calling @pred on each character. If @@ -4364,7 +4364,7 @@ gtk_text_iter_forward_find_char (GtkTextIter *iter, * gtk_text_iter_backward_find_char: * @iter: a #GtkTextIter * @pred: (scope call): function to be called on each character - * @user_data: user data for @pred + * @user_data: (closure): user data for @pred * @limit: (allow-none): search limit, or %NULL for none * * Same as gtk_text_iter_forward_find_char(), but goes backward from @iter. diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c index 597de53c6f..1f22e2391e 100644 --- a/gtk/gtktreelistmodel.c +++ b/gtk/gtktreelistmodel.c @@ -749,7 +749,7 @@ gtk_tree_list_model_init (GtkTreeListModel *self) * @autoexpand: %TRUE to set the autoexpand property and expand the @root model * @create_func: Function to call to create the #GListModel for the children * of an item - * @user_data: Data to pass to @create_func + * @user_data: (closure): Data to pass to @create_func * @user_destroy: Function to call to free @user_data * * Creates a new empty #GtkTreeListModel displaying @root with all rows collapsed. diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index e6c73aae29..226791ab5a 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -2008,7 +2008,7 @@ gtk_tree_model_foreach_helper (GtkTreeModel *model, * gtk_tree_model_foreach: * @model: a #GtkTreeModel * @func: (scope call): a function to be called on each row - * @user_data: user data to passed to @func + * @user_data: (closure): user data to passed to @func * * Calls func on each node in model in a depth-first fashion. * diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c index 4b3dac43eb..0a2c010253 100644 --- a/gtk/gtktreesortable.c +++ b/gtk/gtktreesortable.c @@ -175,7 +175,7 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable *sortable, * @sortable: A #GtkTreeSortable * @sort_column_id: the sort column id to set the function for * @sort_func: The comparison function - * @user_data: (allow-none): User data to pass to @sort_func, or %NULL + * @user_data: (closure): User data to pass to @sort_func, or %NULL * @destroy: (allow-none): Destroy notifier of @user_data, or %NULL * * Sets the comparison function used when sorting to be @sort_func. If the @@ -207,7 +207,7 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable, * gtk_tree_sortable_set_default_sort_func: * @sortable: A #GtkTreeSortable * @sort_func: The comparison function - * @user_data: (allow-none): User data to pass to @sort_func, or %NULL + * @user_data: (closure): User data to pass to @sort_func, or %NULL * @destroy: (allow-none): Destroy notifier of @user_data, or %NULL * * Sets the default comparison function used when sorting to be @sort_func. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index e700bbbd91..56124d6296 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -11145,7 +11145,7 @@ gtk_tree_view_get_expander_column (GtkTreeView *tree_view) * gtk_tree_view_set_column_drag_function: * @tree_view: A #GtkTreeView. * @func: (allow-none): A function to determine which columns are reorderable, or %NULL. - * @user_data: (allow-none): User data to be passed to @func, or %NULL + * @user_data: (closure): User data to be passed to @func, or %NULL * @destroy: (allow-none): Destroy notifier for @user_data, or %NULL * * Sets a user function for determining where a column may be dropped when diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 76de31262a..aaf201b547 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3094,7 +3094,7 @@ static guint tick_callback_id; * gtk_widget_add_tick_callback: * @widget: a #GtkWidget * @callback: function to call for updating animations - * @user_data: data to pass to @callback + * @user_data: (closure): data to pass to @callback * @notify: function to call to free @user_data when the callback is removed. * * Queues an animation frame update and adds a callback to be called @@ -3419,7 +3419,7 @@ ensure_surface_transform_data (GtkWidget *widget) * gtk_widget_add_surface_transform_changed_callback: * @widget: a #GtkWidget * @callback: a function to call when the surface transform changes - * @user_data: data to pass to @callback + * @user_data: (closure): data to pass to @callback * @notify: function to call to free @user_data when the callback is removed * * Invokes the callback whenever the surface relative transform of the widget |