From b1beb3650bd2c66835e00da86a8beda83495d8cc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 6 Jun 2021 08:24:52 -0400 Subject: [PATCH 1/4] treeview: Add a few missing annotations gtk_tree_view_row_activated and the ::row-activated signal can (and do) receive NULL for the column occasionally. This is an introspection api change. Fixes: #3828 --- gtk/gtktreeview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index bf8b05a435..17fe30305e 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1167,7 +1167,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) * GtkTreeView::row-activated: * @tree_view: the object on which the signal is emitted * @path: the `GtkTreePath` for the activated row - * @column: the `GtkTreeViewColumn` in which the activation occurred + * @column: (nullable): the `GtkTreeViewColumn` in which the activation occurred * * The "row-activated" signal is emitted when the method * gtk_tree_view_row_activated() is called, when the user double @@ -11283,7 +11283,7 @@ gtk_tree_view_scroll_to_cell (GtkTreeView *tree_view, * gtk_tree_view_row_activated: * @tree_view: A `GtkTreeView` * @path: The `GtkTreePath` to be activated. - * @column: The `GtkTreeViewColumn` to be activated. + * @column: (nullable): The `GtkTreeViewColumn` to be activated. * * Activates the cell determined by @path and @column. **/ From c2f2a4522780632d8debc9691cb902873e7fd4b7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 8 Jun 2021 07:57:55 -0400 Subject: [PATCH 2/4] treeview: Documentation tweaks --- gtk/gtktreeview.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 17fe30305e..7d58986458 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1170,12 +1170,14 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) * @column: (nullable): the `GtkTreeViewColumn` in which the activation occurred * * The "row-activated" signal is emitted when the method - * gtk_tree_view_row_activated() is called, when the user double - * clicks a treeview row with the "activate-on-single-click" - * property set to %FALSE, or when the user single clicks a row when - * the "activate-on-single-click" property set to %TRUE. It is also - * emitted when a non-editable row is selected and one of the keys: - * Space, Shift+Space, Return or Enter is pressed. + * gtk_tree_view_row_activated() is called. + * + * It is called when the user double-clicks a treeview row with the + * [property@Gtk.TreeView:activate-on-single-click] property set to %FALSE, + * or when the user single-clicks a row when that property set to %TRUE. + * + * This signal is also emitted when a non-editable row is selected and one + * of the keys: Space, Shift+Space, Return or Enter is pressed. * * For selection handling refer to the * [tree widget conceptual overview][TreeWidget] From e35e7bcd4a84e5d82e5241a42968139b582b9758 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 8 Jun 2021 12:59:38 +0000 Subject: [PATCH 3/4] Apply 1 suggestion(s) to 1 file(s) --- gtk/gtktreeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 7d58986458..bc91b7f83e 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1177,7 +1177,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) * or when the user single-clicks a row when that property set to %TRUE. * * This signal is also emitted when a non-editable row is selected and one - * of the keys: Space, Shift+Space, Return or Enter is pressed. + * of the keys: Space, Shift+Space, Return or Enter is pressed. * * For selection handling refer to the * [tree widget conceptual overview][TreeWidget] From 6a86acb9cec8d8852b326e9b3d56746f3adb245c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 8 Jun 2021 12:59:57 +0000 Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s) --- gtk/gtktreeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index bc91b7f83e..0895756234 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1172,7 +1172,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) * The "row-activated" signal is emitted when the method * gtk_tree_view_row_activated() is called. * - * It is called when the user double-clicks a treeview row with the + * This signal is emitted when the user double-clicks a treeview row with the * [property@Gtk.TreeView:activate-on-single-click] property set to %FALSE, * or when the user single-clicks a row when that property set to %TRUE. *