From d663909159de1102b9373870d5294d595c3118ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Thu, 19 Nov 2020 15:53:05 +0100 Subject: [PATCH] shortcutcontroller: Use priv->shortcuts directly in set_widget() Instead of treating the shortcut controller itself as a GListModel, which just passes everything along from priv->shortcuts. --- gtk/gtkshortcutcontroller.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c index 3d63bbfdf3..2e660ed031 100644 --- a/gtk/gtkshortcutcontroller.c +++ b/gtk/gtkshortcutcontroller.c @@ -486,13 +486,14 @@ gtk_shortcut_controller_set_widget (GtkEventController *controller, GtkWidget *widget) { GtkShortcutController *self = GTK_SHORTCUT_CONTROLLER (controller); + GListModel *shortcuts = self->shortcuts; guint i, p; GTK_EVENT_CONTROLLER_CLASS (gtk_shortcut_controller_parent_class)->set_widget (controller, widget); - for (i = 0, p = g_list_model_get_n_items (G_LIST_MODEL (controller)); i < p; i++) + for (i = 0, p = g_list_model_get_n_items (shortcuts); i < p; i++) { - GtkShortcut *shortcut = g_list_model_get_item (G_LIST_MODEL (controller), i); + GtkShortcut *shortcut = g_list_model_get_item (shortcuts, i); if (GTK_IS_SHORTCUT (shortcut)) update_accel (shortcut, widget, TRUE); g_object_unref (shortcut);