From 70a3e5e8ceeb04e3fd7e2fad3ff4107f0985d16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Sat, 26 Dec 2020 09:59:46 +0100 Subject: [PATCH] shortcutmanager: Use g_list_store_find() We require glib 2.66 these days, so we can unconditionally use g_list_store_find(). --- gtk/gtkshortcutmanager.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gtk/gtkshortcutmanager.c b/gtk/gtkshortcutmanager.c index 0351490df2..ec70791e77 100644 --- a/gtk/gtkshortcutmanager.c +++ b/gtk/gtkshortcutmanager.c @@ -108,24 +108,11 @@ gtk_shortcut_manager_default_remove_controller (GtkShortcutManager *self, if (model) { GListModel *store; - guint position, len; + guint position; store = gtk_flatten_list_model_get_model (model); -#if 0 && GLIB_CHECK_VERSION(2,64,0) - if (_g_list_store_find (G_LIST_STORE (store), controller, &position)) + if (g_list_store_find (G_LIST_STORE (store), controller, &position)) g_list_store_remove (G_LIST_STORE (store), position); -#else - for (position = 0, len = g_list_model_get_n_items (store); position < len; position++) - { - GtkShortcutController *item = g_list_model_get_item (store, position); - g_object_unref (item); - if (item == controller) - { - g_list_store_remove (G_LIST_STORE (store), position); - break; - } - } -#endif } }