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 <pwithnall@endlessos.org> Helps: #31
This commit is contained in:
parent
d4951a333f
commit
537d4bf791
|
@ -64,7 +64,7 @@ struct _MctRestrictApplicationsSelector
|
||||||
GtkLabel *placeholder;
|
GtkLabel *placeholder;
|
||||||
|
|
||||||
GList *cached_apps; /* (nullable) (owned) (element-type GAppInfo) */
|
GList *cached_apps; /* (nullable) (owned) (element-type GAppInfo) */
|
||||||
GListStore *apps; /* (owned) */
|
GListStore *apps;
|
||||||
GAppInfoMonitor *app_info_monitor; /* (owned) */
|
GAppInfoMonitor *app_info_monitor; /* (owned) */
|
||||||
gulong app_info_monitor_changed_id;
|
gulong app_info_monitor_changed_id;
|
||||||
GHashTable *blocklisted_apps; /* (owned) (element-type GAppInfo) */
|
GHashTable *blocklisted_apps; /* (owned) (element-type GAppInfo) */
|
||||||
|
@ -156,7 +156,6 @@ mct_restrict_applications_selector_dispose (GObject *object)
|
||||||
MctRestrictApplicationsSelector *self = (MctRestrictApplicationsSelector *)object;
|
MctRestrictApplicationsSelector *self = (MctRestrictApplicationsSelector *)object;
|
||||||
|
|
||||||
g_clear_pointer (&self->blocklisted_apps, g_hash_table_unref);
|
g_clear_pointer (&self->blocklisted_apps, g_hash_table_unref);
|
||||||
g_clear_object (&self->apps);
|
|
||||||
g_clear_list (&self->cached_apps, g_object_unref);
|
g_clear_list (&self->cached_apps, g_object_unref);
|
||||||
|
|
||||||
if (self->app_info_monitor != NULL && self->app_info_monitor_changed_id != 0)
|
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, listbox);
|
||||||
gtk_widget_class_bind_template_child (widget_class, MctRestrictApplicationsSelector, placeholder);
|
gtk_widget_class_bind_template_child (widget_class, MctRestrictApplicationsSelector, placeholder);
|
||||||
|
gtk_widget_class_bind_template_child (widget_class, MctRestrictApplicationsSelector, apps);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -234,9 +234,6 @@ mct_restrict_applications_selector_init (MctRestrictApplicationsSelector *self)
|
||||||
|
|
||||||
gtk_widget_init_template (GTK_WIDGET (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 = g_app_info_monitor_get ();
|
||||||
self->app_info_monitor_changed_id =
|
self->app_info_monitor_changed_id =
|
||||||
g_signal_connect (self->app_info_monitor, "changed",
|
g_signal_connect (self->app_info_monitor, "changed",
|
||||||
|
|
|
@ -20,4 +20,8 @@
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<object class="GListStore" id="apps">
|
||||||
|
<property name="item-type">GAppInfo</property>
|
||||||
|
</object>
|
||||||
</interface>
|
</interface>
|
||||||
|
|
Loading…
Reference in New Issue