M!32 - Replace deprecated 'g_type_class_add_private'

Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/32

2 files changed, 12 insertions, 19 deletions

diff --git a/src/modules/gnome-online-accounts/e-goa-client.c b/src/modules/gnome-online-accounts/e-goa-client.c
index 48e3953e9..aa72e6434 100644
--- a/src/modules/gnome-online-accounts/e-goa-client.c
+++ b/src/modules/gnome-online-accounts/e-goa-client.c
@@ -21,10 +21,6 @@
 
 #include "e-goa-client.h"
 
-#define E_GOA_CLIENT_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_GOA_CLIENT, EGoaClientPrivate))
-
 struct _EGoaClientPrivate {
 	GDBusObjectManager *object_manager;
 	gulong object_added_handler_id;
@@ -60,6 +56,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	e_goa_client,
 	G_TYPE_OBJECT,
 	0,
+	G_ADD_PRIVATE_DYNAMIC (EGoaClient)
 	G_IMPLEMENT_INTERFACE_DYNAMIC (
 		G_TYPE_INITABLE,
 		e_goa_client_interface_init)
@@ -269,7 +266,7 @@ e_goa_client_dispose (GObject *object)
 {
 	EGoaClientPrivate *priv;
 
-	priv = E_GOA_CLIENT_GET_PRIVATE (object);
+	priv = E_GOA_CLIENT (object)->priv;
 
 	if (priv->object_added_handler_id > 0) {
 		g_signal_handler_disconnect (
@@ -305,7 +302,7 @@ e_goa_client_finalize (GObject *object)
 {
 	EGoaClientPrivate *priv;
 
-	priv = E_GOA_CLIENT_GET_PRIVATE (object);
+	priv = E_GOA_CLIENT (object)->priv;
 
 	g_hash_table_destroy (priv->orphans);
 	g_mutex_clear (&priv->orphans_lock);
@@ -322,7 +319,7 @@ e_goa_client_initable_init (GInitable *initable,
 	EGoaClientPrivate *priv;
 	gulong handler_id;
 
-	priv = E_GOA_CLIENT_GET_PRIVATE (initable);
+	priv = E_GOA_CLIENT (initable)->priv;
 
 	priv->object_manager = goa_object_manager_client_new_for_bus_sync (
 		G_BUS_TYPE_SESSION,
@@ -360,8 +357,6 @@ e_goa_client_class_init (EGoaClientClass *class)
 {
 	GObjectClass *object_class;
 
-	g_type_class_add_private (class, sizeof (EGoaClientPrivate));
-
 	object_class = G_OBJECT_CLASS (class);
 	object_class->get_property = e_goa_client_get_property;
 	object_class->dispose = e_goa_client_dispose;
@@ -420,7 +415,7 @@ e_goa_client_interface_init (GInitableIface *iface)
 static void
 e_goa_client_init (EGoaClient *client)
 {
-	client->priv = E_GOA_CLIENT_GET_PRIVATE (client);
+	client->priv = e_goa_client_get_instance_private (client);
 
 	client->priv->orphans = g_hash_table_new_full (
 		(GHashFunc) g_str_hash,
diff --git a/src/modules/gnome-online-accounts/e-goa-password-based.c b/src/modules/gnome-online-accounts/e-goa-password-based.c
index 4444d0b56..c5949aee0 100644
--- a/src/modules/gnome-online-accounts/e-goa-password-based.c
+++ b/src/modules/gnome-online-accounts/e-goa-password-based.c
@@ -25,16 +25,16 @@
 
 #include "e-goa-password-based.h"
 
-#define E_GOA_PASSWORD_BASED_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_GOA_PASSWORD_BASED, EGoaPasswordBasedPrivate))
-
 struct _EGoaPasswordBasedPrivate {
 	GoaClient *goa_client;
 	GMutex lock;
 };
 
-G_DEFINE_DYNAMIC_TYPE (EGoaPasswordBased, e_goa_password_based, E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (EGoaPasswordBased,
+				e_goa_password_based,
+				E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL,
+				0,
+				G_ADD_PRIVATE_DYNAMIC (EGoaPasswordBased))
 
 static GoaClient *
 e_goa_password_based_ref_goa_client_sync (EGoaPasswordBased *goa_password_based,
@@ -350,8 +350,6 @@ e_goa_password_based_class_init (EGoaPasswordBasedClass *class)
 	ESourceCredentialsProviderImplClass *provider_impl_class;
 	GObjectClass *object_class;
 
-	g_type_class_add_private (class, sizeof (EGoaPasswordBasedPrivate));
-
 	provider_impl_class = E_SOURCE_CREDENTIALS_PROVIDER_IMPL_CLASS (class);
 	provider_impl_class->can_process = e_goa_password_based_can_process;
 	provider_impl_class->can_store = e_goa_password_based_can_store;
@@ -371,7 +369,7 @@ e_goa_password_based_class_finalize (EGoaPasswordBasedClass *class)
 static void
 e_goa_password_based_init (EGoaPasswordBased *session)
 {
-	session->priv = E_GOA_PASSWORD_BASED_GET_PRIVATE (session);
+	session->priv = e_goa_password_based_get_instance_private (session);
 
 	g_mutex_init (&session->priv->lock);
 }
@@ -379,7 +377,7 @@ e_goa_password_based_init (EGoaPasswordBased *session)
 void
 e_goa_password_based_type_register (GTypeModule *type_module)
 {
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+	/* XXX G_DEFINE_DYNAMIC_TYPE_EXTENDED declares a static type registration
 	 *     function, so we have to wrap it with a public function in
 	 *     order to register types from a separate compilation unit. */
 	e_goa_password_based_register_type (type_module);