Skip to content
Snippets Groups Projects
Verified Commit 88a84aef authored by Bruce Cowan's avatar Bruce Cowan :airplane:
Browse files

Dispose of templates properly

parent 0fddd186
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ desktopdir = datadir / 'applications' ...@@ -19,7 +19,7 @@ desktopdir = datadir / 'applications'
gnome = import('gnome') gnome = import('gnome')
gio_dep = dependency('gio-2.0', version: '>= 2.66') gio_dep = dependency('gio-2.0', version: '>= 2.66')
gtk_dep = dependency('gtk4', version: '>= 4.0') gtk_dep = dependency('gtk4', version: '>= 4.8')
libadwaita_dep = dependency('libadwaita-1') libadwaita_dep = dependency('libadwaita-1')
conf = configuration_data() conf = configuration_data()
...@@ -45,8 +45,8 @@ config_h = vcs_tag( ...@@ -45,8 +45,8 @@ config_h = vcs_tag(
cflags = ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', cflags = ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66',
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66',
'-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0', '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_8',
'-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_0', '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_8',
'-Wno-overlength-strings', '-Wno-overlength-strings',
] ]
......
...@@ -105,6 +105,14 @@ const GActionEntry win_entries[] = { ...@@ -105,6 +105,14 @@ const GActionEntry win_entries[] = {
{ .name = "show-primary-menu", .activate = activate_show_primary_menu }, { .name = "show-primary-menu", .activate = activate_show_primary_menu },
}; };
static void
rugby_app_window_dispose (GObject *object)
{
gtk_widget_dispose_template (GTK_WIDGET (object), RUGBY_TYPE_APP_WINDOW);
G_OBJECT_CLASS (rugby_app_window_parent_class)->dispose (object);
}
static void static void
rugby_app_window_init (RugbyAppWindow *self) rugby_app_window_init (RugbyAppWindow *self)
{ {
...@@ -119,11 +127,14 @@ rugby_app_window_init (RugbyAppWindow *self) ...@@ -119,11 +127,14 @@ rugby_app_window_init (RugbyAppWindow *self)
static void static void
rugby_app_window_class_init (RugbyAppWindowClass *klass) rugby_app_window_class_init (RugbyAppWindowClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
g_type_ensure (RUGBY_TYPE_POSSIBILITY_WIDGET); g_type_ensure (RUGBY_TYPE_POSSIBILITY_WIDGET);
g_type_ensure (RUGBY_TYPE_LIST_STORE); g_type_ensure (RUGBY_TYPE_LIST_STORE);
object_class->dispose = rugby_app_window_dispose;
gtk_widget_class_set_template_from_resource (widget_class, gtk_widget_class_set_template_from_resource (widget_class,
"/uk/me/bcowan/Rugby/window.ui"); "/uk/me/bcowan/Rugby/window.ui");
......
...@@ -24,6 +24,7 @@ rugby_pref_window_dispose (GObject *object) ...@@ -24,6 +24,7 @@ rugby_pref_window_dispose (GObject *object)
{ {
RugbyPrefWindow *self = RUGBY_PREF_WINDOW (object); RugbyPrefWindow *self = RUGBY_PREF_WINDOW (object);
gtk_widget_dispose_template (GTK_WIDGET (object), RUGBY_TYPE_PREF_WINDOW);
g_clear_object (&self->settings); g_clear_object (&self->settings);
G_OBJECT_CLASS (rugby_pref_window_parent_class)->dispose (object); G_OBJECT_CLASS (rugby_pref_window_parent_class)->dispose (object);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment