Remove use of deprecated g_type_class_add_private

3 files changed, 12 insertions, 13 deletions

diff --git a/tests/src/x-authority.c b/tests/src/x-authority.c
index adba92c4..8c0aa508 100644
--- a/tests/src/x-authority.c
+++ b/tests/src/x-authority.c
@@ -19,8 +19,8 @@ struct XAuthorityRecordPrivate
     guint8 *authorization_data;
 };
 
-G_DEFINE_TYPE (XAuthority, x_authority, G_TYPE_OBJECT)
-G_DEFINE_TYPE (XAuthorityRecord, x_authority_record, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (XAuthority, x_authority, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (XAuthorityRecord, x_authority_record, G_TYPE_OBJECT)
 
 XAuthority *
 x_authority_new (void)
@@ -158,7 +158,6 @@ x_authority_class_init (XAuthorityClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     object_class->finalize = x_authority_finalize;
-    g_type_class_add_private (klass, sizeof (XAuthorityPrivate));
 }
 
 guint16
@@ -210,5 +209,4 @@ x_authority_record_class_init (XAuthorityRecordClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     object_class->finalize = x_authority_record_finalize;
-    g_type_class_add_private (klass, sizeof (XAuthorityRecordPrivate));
 }
diff --git a/tests/src/x-server.c b/tests/src/x-server.c
index e1537e83..e603fc03 100644
--- a/tests/src/x-server.c
+++ b/tests/src/x-server.c
@@ -12,9 +12,6 @@
 
 #include "x-server.h"
 
-G_DEFINE_TYPE (XServer, x_server, G_TYPE_OBJECT)
-G_DEFINE_TYPE (XClient, x_client, G_TYPE_OBJECT)
-
 #define MAXIMUM_REQUEST_LENGTH 65535
 
 enum {
@@ -35,6 +32,8 @@ struct XServerPrivate
     GHashTable *clients;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (XServer, x_server, G_TYPE_OBJECT)
+
 struct XClientPrivate
 {
     XServer *server;
@@ -42,6 +41,8 @@ struct XClientPrivate
     GIOChannel *channel;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (XClient, x_client, G_TYPE_OBJECT)
+
 enum
 {
     X_CLIENT_DISCONNECTED,
@@ -82,8 +83,6 @@ x_client_init (XClient *client)
 static void
 x_client_class_init (XClientClass *klass)
 {
-    g_type_class_add_private (klass, sizeof (XClientPrivate));
-
     x_client_signals[X_CLIENT_DISCONNECTED] =
         g_signal_new (X_CLIENT_SIGNAL_DISCONNECTED,
                       G_TYPE_FROM_CLASS (klass),
@@ -198,8 +197,9 @@ static void
 x_server_class_init (XServerClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
     object_class->finalize = x_server_finalize;
-    g_type_class_add_private (klass, sizeof (XServerPrivate));
+
     x_server_signals[X_SERVER_CLIENT_CONNECTED] =
         g_signal_new (X_SERVER_SIGNAL_CLIENT_CONNECTED,
                       G_TYPE_FROM_CLASS (klass),
diff --git a/tests/src/xdmcp-client.c b/tests/src/xdmcp-client.c
index 99d789d8..de40702b 100644
--- a/tests/src/xdmcp-client.c
+++ b/tests/src/xdmcp-client.c
@@ -9,8 +9,6 @@
 #include "x-common.h"
 #include "xdmcp-client.h"
 
-G_DEFINE_TYPE (XDMCPClient, xdmcp_client, G_TYPE_OBJECT)
-
 #define MAXIMUM_REQUEST_LENGTH 65535
 
 typedef enum
@@ -42,6 +40,8 @@ struct XDMCPClientPrivate
     guint8 *authorization_data;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (XDMCPClient, xdmcp_client, G_TYPE_OBJECT)
+
 enum {
     XDMCP_CLIENT_WILLING,
     XDMCP_CLIENT_UNWILLING,
@@ -469,8 +469,9 @@ static void
 xdmcp_client_class_init (XDMCPClientClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
     object_class->finalize = xdmcp_client_finalize;
-    g_type_class_add_private (klass, sizeof (XDMCPClientPrivate));
+
     xdmcp_client_signals[XDMCP_CLIENT_WILLING] =
         g_signal_new (XDMCP_CLIENT_SIGNAL_WILLING,
                       G_TYPE_FROM_CLASS (klass),