From 36e473787006347a8954ca7bc958d1eb39aa57f6 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
Date: Tue, 12 Apr 2022 11:29:52 -0500
Subject: tests: use the non-deprecated way to add private data to a class

---
 meson.build                    |  2 +-
 tests/dummyatk/my-atk-action.c | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/meson.build b/meson.build
index 2974362..7f4529a 100644
--- a/meson.build
+++ b/meson.build
@@ -35,7 +35,7 @@ root_inc = include_directories('.')
 
 # Dependencies
 libdbus_req_version = '>= 1.5'
-glib_req_version = '>= 2.32.0'
+glib_req_version = '>= 2.38.0'
 gobject_req_version = '>= 2.0.0'
 gmodule_req_version = '>= 2.0.0'
 atk_req_version = '>= 2.38.0'
diff --git a/tests/dummyatk/my-atk-action.c b/tests/dummyatk/my-atk-action.c
index 5af63c3..a4fd39f 100644
--- a/tests/dummyatk/my-atk-action.c
+++ b/tests/dummyatk/my-atk-action.c
@@ -39,15 +39,6 @@ struct _MyAtkActionInfo {
 
 static void atk_action_interface_init (AtkActionIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (MyAtkAction,
-                         my_atk_action,
-                         MY_TYPE_ATK_OBJECT,
-                         G_IMPLEMENT_INTERFACE(ATK_TYPE_ACTION,
-                             atk_action_interface_init));
-
-#define MY_ATK_ACTION_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MY_TYPE_ATK_ACTION, MyAtkActionPrivate))
-
 struct _MyAtkActionPrivate {
   GQueue *action_queue;
   guint action_idle_handler;
@@ -55,6 +46,13 @@ struct _MyAtkActionPrivate {
   GList *children;
 };
 
+G_DEFINE_TYPE_WITH_CODE (MyAtkAction,
+                         my_atk_action,
+                         MY_TYPE_ATK_OBJECT,
+                         G_IMPLEMENT_INTERFACE(ATK_TYPE_ACTION,
+                             atk_action_interface_init)
+                         G_ADD_PRIVATE (MyAtkAction));
+
 static void
 my_atk_action_initialize (AtkObject *obj, gpointer data)
 {
@@ -63,7 +61,7 @@ my_atk_action_initialize (AtkObject *obj, gpointer data)
 static void
 my_atk_action_init (MyAtkAction *action_obj)
 {
-  MyAtkActionPrivate *priv = MY_ATK_ACTION_GET_PRIVATE (action_obj);
+  MyAtkActionPrivate *priv = my_atk_action_get_instance_private (action_obj);
   action_obj->priv = priv;
   priv->action_queue = NULL;
   priv->action_idle_handler = 0;
@@ -85,8 +83,6 @@ my_atk_action_class_init (MyAtkActionClass *my_class)
   gobject_class->finalize = my_atk_action_finalize;
 
   atk_class->initialize = my_atk_action_initialize;
-
-  g_type_class_add_private (gobject_class, sizeof (MyAtkActionPrivate));
 }
 
 static MyAtkActionInfo *
-- 
cgit v1.2.1