[gtk/matthiasc/for-master: 23/29] shortcutcontroller: Use priv->shortcuts directly in set_widget()
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-master: 23/29] shortcutcontroller: Use priv->shortcuts directly in set_widget()
- Date: Mon, 30 Nov 2020 14:27:08 +0000 (UTC)
commit d663909159de1102b9373870d5294d595c3118ca
Author: Timm Bäder <mail baedert org>
Date: Thu Nov 19 15:53:05 2020 +0100
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]