From 02136b4a21184eff494c509a5f349505eadcd146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 17 Nov 2025 14:30:08 -0800 Subject: [PATCH 1/2] MainWindow: use get_components_by_extends --- src/MainWindow.vala | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 88a6efdf..85af9976 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -167,30 +167,26 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { placeholder_stack.visible_child = placeholder; }); - appstream_pool.get_components_by_id ("io.elementary.settings").as_array ().foreach ((component) => { - component.get_addons ().foreach ((addon) => { - var repo_row = new RepoRow ( - addon.name, - get_extension_icon_from_appstream (addon.get_icons ()), - Category.SETTINGS, - addon.get_url (AppStream.UrlKind.BUGTRACKER) - ); - - listbox.append (repo_row); - }); + appstream_pool.get_components_by_extends ("io.elementary.settings").as_array ().foreach ((component) => { + var repo_row = new RepoRow ( + component.name, + icon_from_appstream_component (component), + Category.SETTINGS, + component.get_url (AppStream.UrlKind.BUGTRACKER) + ); + + listbox.append (repo_row); }); - appstream_pool.get_components_by_id ("io.elementary.wingpanel").as_array ().foreach ((component) => { - component.get_addons ().foreach ((addon) => { - var repo_row = new RepoRow ( - addon.name, - get_extension_icon_from_appstream (addon.get_icons ()), - Category.PANEL, - addon.get_url (AppStream.UrlKind.BUGTRACKER) - ); + appstream_pool.get_components_by_extends ("io.elementary.wingpanel").as_array ().foreach ((component) => { + var repo_row = new RepoRow ( + component.name, + icon_from_appstream_component (component), + Category.PANEL, + component.get_url (AppStream.UrlKind.BUGTRACKER) + ); - listbox.append (repo_row); - }); + listbox.append (repo_row); }); } catch (Error e) { critical (e.message); From d468e6d11752784180d1a566c9c5dc0f730b18c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 17 Nov 2025 14:48:03 -0800 Subject: [PATCH 2/2] Remove unused extension icon function --- src/MainWindow.vala | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 85af9976..8f407bff 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -363,16 +363,6 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { return components; } - private Icon get_extension_icon_from_appstream (GLib.GenericArray appstream_icons) { - foreach (unowned AppStream.Icon appstream_icon in appstream_icons) { - if (appstream_icon.get_kind () == AppStream.IconKind.STOCK) { - return new ThemedIcon (appstream_icon.get_name ()); - } - } - - return new ThemedIcon ("extension"); - } - private Icon icon_from_appstream_component (AppStream.Component component) { var as_icons = component.get_icons (); Icon icon;