diff options
Diffstat (limited to 'tests/src/x-server.c')
| -rw-r--r-- | tests/src/x-server.c | 12 |
1 files changed, 6 insertions, 6 deletions
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), |