From bbfaebd1cdbd1a85af1909fcda77ba6e020243aa Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 23 Mar 2023 20:37:57 +0100 Subject: [PATCH 1/2] listview: Activatable means activate Fix a typo that prevented activatable widgets from activating since the refactoring in 608be08b0d6. --- gtk/gtklistfactorywidget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtklistfactorywidget.c b/gtk/gtklistfactorywidget.c index 8e0197e6ee..684cefa3e6 100644 --- a/gtk/gtklistfactorywidget.c +++ b/gtk/gtklistfactorywidget.c @@ -65,7 +65,7 @@ gtk_list_factory_widget_activate_signal (GtkListFactoryWidget *self) { GtkListFactoryWidgetPrivate *priv = gtk_list_factory_widget_get_instance_private (self); - if (priv->activatable) + if (!priv->activatable) return; gtk_widget_activate_action (GTK_WIDGET (self), From 8c0152a1afd12f39b1a72efa2f086b7bb58b88c2 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 24 Mar 2023 02:53:42 +0100 Subject: [PATCH 2/2] columnview: Don't infloop when a cell is grab_focus()ed Whoopsie. Broken since 30d4629043f. --- gtk/gtkcolumnviewrowwidget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtkcolumnviewrowwidget.c b/gtk/gtkcolumnviewrowwidget.c index 8871ebcd0f..04991aeb91 100644 --- a/gtk/gtkcolumnviewrowwidget.c +++ b/gtk/gtkcolumnviewrowwidget.c @@ -254,7 +254,7 @@ gtk_column_view_row_widget_grab_focus (GtkWidget *widget) for (child = focus_child ? gtk_widget_get_next_sibling (focus_child) : gtk_widget_get_first_child (widget); child != focus_child; - child = gtk_widget_get_next_sibling (child)) + child = child ? gtk_widget_get_next_sibling (child) : gtk_widget_get_first_child (widget)) { /* When we started iterating at focus_child, we want to iterate over the rest * of the children, too */