GNOME.org
 

[gtk: 2/3] Add missing (closure) GIR annotations

commit 83867f9cbf229c1338d84739a68b318a809d8d2e
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Jan 13 14:26:50 2020 +1300

    Add missing (closure) GIR annotations

 gdk/gdkcontentproviderimpl.c                | 2 +-
 gdk/wayland/gdksurface-wayland.c            | 2 +-
 gtk/gtkfilterlistmodel.c                    | 4 ++--
 gtk/gtkflowbox.c                            | 2 +-
 gtk/gtkfontchooser.c                        | 2 +-
 gtk/gtklistbox.c                            | 2 +-
 gtk/gtkmaplistmodel.c                       | 4 ++--
 gtk/gtkmenubutton.c                         | 2 +-
 gtk/gtkprintjob.c                           | 2 +-
 gtk/gtkprintsettings.c                      | 2 +-
 gtk/gtkscale.c                              | 2 +-
 gtk/gtksortlistmodel.c                      | 4 ++--
 gtk/gtktextiter.c                           | 4 ++--
 gtk/gtktreelistmodel.c                      | 2 +-
 gtk/gtktreemodel.c                          | 2 +-
 gtk/gtktreesortable.c                       | 4 ++--
 gtk/gtktreeview.c                           | 2 +-
 gtk/gtkwidget.c                             | 4 ++--
 modules/printbackends/gtkcupssecretsutils.c | 2 +-
 19 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/gdk/gdkcontentproviderimpl.c b/gdk/gdkcontentproviderimpl.c
index ebea1356a3..c114e8c3b2 100644
--- a/gdk/gdkcontentproviderimpl.c
+++ b/gdk/gdkcontentproviderimpl.c
@@ -348,7 +348,7 @@ gdk_content_provider_callback_init (GdkContentProviderCallback *content)
  * gdk_content_provider_new_for_callback:
  * @type: the type that the callback provides
  * @func: callback to populate a #GValue
- * @data: data that gets passed to @func
+ * @data: (closure): data that gets passed to @func
  *
  * Create a content provider that provides data that is provided via a callback.
  *
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index c24091c607..7aa8125048 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -4109,7 +4109,7 @@ gdk_wayland_surface_is_exported (GdkSurface *surface)
  * gdk_wayland_surface_export_handle:
  * @surface: the #GdkSurface to obtain a handle for
  * @callback: callback to call with the handle
- * @user_data: user data for @callback
+ * @user_data: (closure): user data for @callback
  * @destroy_func: destroy notify for @user_data
  *
  * Asynchronously obtains a handle for a surface that can be passed
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 d5141c4440..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.
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 68ddfe083d..681c33f3aa 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -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
diff --git a/modules/printbackends/gtkcupssecretsutils.c b/modules/printbackends/gtkcupssecretsutils.c
index 925f7d561c..8b78c97f06 100644
--- a/modules/printbackends/gtkcupssecretsutils.c
+++ b/modules/printbackends/gtkcupssecretsutils.c
@@ -942,7 +942,7 @@ cleanup_task_data (gpointer data)
  * @source_object: Source object for this task
  * @cancellable: Cancellable to cancel this task
  * @callback: Callback to call once the query is finished
- * @user_data: The user_data passed to the callback
+ * @user_data: (closure): The user_data passed to the callback
  * @printer_uri: URI of the printer
  * @auth_info_required: Info required for authentication
  *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]