From e36a8ab8ba0fa4138d877deaeea5aada84271719 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Sat, 12 Oct 2024 16:18:05 +0100
Subject: [PATCH] Properly use final types
---
meson.build | 4 ++--
src/rugby-app-window.c | 2 +-
src/rugby-list-store.c | 6 +++---
src/rugby-possibility-widget.c | 2 +-
src/rugby-possibility.c | 2 +-
src/rugby-pref-dialog.c | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meson.build b/meson.build
index 2d969da..bb97c76 100644
--- a/meson.build
+++ b/meson.build
@@ -33,8 +33,8 @@ else
conf.set_quoted('VERSION', meson.project_version())
endif
-cflags = ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66',
- '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66',
+cflags = ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_70',
+ '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_70',
'-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_12',
'-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_12',
'-Wno-overlength-strings',
diff --git a/src/rugby-app-window.c b/src/rugby-app-window.c
index 1263634..c3c41c4 100644
--- a/src/rugby-app-window.c
+++ b/src/rugby-app-window.c
@@ -26,7 +26,7 @@ struct _RugbyAppWindow
GtkCustomFilter *try_filter;
};
-G_DEFINE_TYPE (RugbyAppWindow, rugby_app_window, ADW_TYPE_APPLICATION_WINDOW)
+G_DEFINE_FINAL_TYPE (RugbyAppWindow, rugby_app_window, ADW_TYPE_APPLICATION_WINDOW)
static void
list_store_items_changed_cb ( GListModel *model,
diff --git a/src/rugby-list-store.c b/src/rugby-list-store.c
index 6fe3590..5e51892 100644
--- a/src/rugby-list-store.c
+++ b/src/rugby-list-store.c
@@ -22,9 +22,9 @@ struct _RugbyListStore
static void rugby_list_store_list_model_iface_init (GListModelInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (RugbyListStore, rugby_list_store, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
- rugby_list_store_list_model_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (RugbyListStore, rugby_list_store, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+ rugby_list_store_list_model_iface_init))
enum
{
diff --git a/src/rugby-possibility-widget.c b/src/rugby-possibility-widget.c
index a08148c..cd6b8ae 100644
--- a/src/rugby-possibility-widget.c
+++ b/src/rugby-possibility-widget.c
@@ -19,7 +19,7 @@ struct _RugbyPossibilityWidget
RugbyPossibility *possibility;
};
-G_DEFINE_TYPE (RugbyPossibilityWidget, rugby_possibility_widget, GTK_TYPE_WIDGET)
+G_DEFINE_FINAL_TYPE (RugbyPossibilityWidget, rugby_possibility_widget, GTK_TYPE_WIDGET)
enum
{
diff --git a/src/rugby-possibility.c b/src/rugby-possibility.c
index 3356461..c5a2ad3 100644
--- a/src/rugby-possibility.c
+++ b/src/rugby-possibility.c
@@ -16,7 +16,7 @@ struct _RugbyPossibility
int kicks;
};
-G_DEFINE_TYPE (RugbyPossibility, rugby_possibility, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (RugbyPossibility, rugby_possibility, G_TYPE_OBJECT)
enum
{
diff --git a/src/rugby-pref-dialog.c b/src/rugby-pref-dialog.c
index dcd30f4..e52b252 100644
--- a/src/rugby-pref-dialog.c
+++ b/src/rugby-pref-dialog.c
@@ -17,7 +17,7 @@ struct _RugbyPrefDialog
GSettings *settings;
};
-G_DEFINE_TYPE (RugbyPrefDialog, rugby_pref_dialog, ADW_TYPE_PREFERENCES_DIALOG)
+G_DEFINE_FINAL_TYPE (RugbyPrefDialog, rugby_pref_dialog, ADW_TYPE_PREFERENCES_DIALOG)
static void
rugby_pref_dialog_dispose (GObject *object)
--
GitLab