From 537d4bf7910433991bdbb2e1fed143be8840f1b1 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 13 Oct 2023 11:23:31 +0100 Subject: [PATCH] restrict-applications-selector: Move GListStore to UI file This simplifies the code a little and will allow binding to it in an upcoming commit. It introduces no functional changes. Signed-off-by: Philip Withnall Helps: #31 --- libmalcontent-ui/restrict-applications-selector.c | 7 ++----- libmalcontent-ui/restrict-applications-selector.ui | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libmalcontent-ui/restrict-applications-selector.c b/libmalcontent-ui/restrict-applications-selector.c index 2da2eee..735dc96 100644 --- a/libmalcontent-ui/restrict-applications-selector.c +++ b/libmalcontent-ui/restrict-applications-selector.c @@ -64,7 +64,7 @@ struct _MctRestrictApplicationsSelector GtkLabel *placeholder; GList *cached_apps; /* (nullable) (owned) (element-type GAppInfo) */ - GListStore *apps; /* (owned) */ + GListStore *apps; GAppInfoMonitor *app_info_monitor; /* (owned) */ gulong app_info_monitor_changed_id; GHashTable *blocklisted_apps; /* (owned) (element-type GAppInfo) */ @@ -156,7 +156,6 @@ mct_restrict_applications_selector_dispose (GObject *object) MctRestrictApplicationsSelector *self = (MctRestrictApplicationsSelector *)object; g_clear_pointer (&self->blocklisted_apps, g_hash_table_unref); - g_clear_object (&self->apps); g_clear_list (&self->cached_apps, g_object_unref); if (self->app_info_monitor != NULL && self->app_info_monitor_changed_id != 0) @@ -225,6 +224,7 @@ mct_restrict_applications_selector_class_init (MctRestrictApplicationsSelectorCl gtk_widget_class_bind_template_child (widget_class, MctRestrictApplicationsSelector, listbox); gtk_widget_class_bind_template_child (widget_class, MctRestrictApplicationsSelector, placeholder); + gtk_widget_class_bind_template_child (widget_class, MctRestrictApplicationsSelector, apps); } static void @@ -234,9 +234,6 @@ mct_restrict_applications_selector_init (MctRestrictApplicationsSelector *self) gtk_widget_init_template (GTK_WIDGET (self)); - self->apps = g_list_store_new (G_TYPE_APP_INFO); - self->cached_apps = NULL; - self->app_info_monitor = g_app_info_monitor_get (); self->app_info_monitor_changed_id = g_signal_connect (self->app_info_monitor, "changed", diff --git a/libmalcontent-ui/restrict-applications-selector.ui b/libmalcontent-ui/restrict-applications-selector.ui index aabda5c..52adf25 100644 --- a/libmalcontent-ui/restrict-applications-selector.ui +++ b/libmalcontent-ui/restrict-applications-selector.ui @@ -20,4 +20,8 @@ + + + GAppInfo +