diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-11 00:29:58 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-24 14:18:01 +0100 |
| commit | 32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d (patch) | |
| tree | 3caf429cb269a3046af9512dbd7b9bee94381e6a /gio/gunixsocketaddress.c | |
| parent | aba80eea6c2965ee253a675610bd31c3dc256419 (diff) | |
| download | glib-32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d.tar.gz | |
gio: Use the new private instance data declaration
Use the newly added macros, and remove the explicit calls to
g_type_class_add_private().
https://bugzilla.gnome.org/show_bug.cgi?id=700035
Diffstat (limited to 'gio/gunixsocketaddress.c')
| -rw-r--r-- | gio/gunixsocketaddress.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c index 84010e771..1ce1740f8 100644 --- a/gio/gunixsocketaddress.c +++ b/gio/gunixsocketaddress.c @@ -57,7 +57,6 @@ * A UNIX-domain (local) socket address, corresponding to a * <type>struct sockaddr_un</type>. */ -G_DEFINE_TYPE (GUnixSocketAddress, g_unix_socket_address, G_TYPE_SOCKET_ADDRESS); enum { @@ -79,6 +78,8 @@ struct _GUnixSocketAddressPrivate GUnixSocketAddressType address_type; }; +G_DEFINE_TYPE_WITH_PRIVATE (GUnixSocketAddress, g_unix_socket_address, G_TYPE_SOCKET_ADDRESS) + static void g_unix_socket_address_set_property (GObject *object, guint prop_id, @@ -248,8 +249,6 @@ g_unix_socket_address_class_init (GUnixSocketAddressClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GSocketAddressClass *gsocketaddress_class = G_SOCKET_ADDRESS_CLASS (klass); - g_type_class_add_private (klass, sizeof (GUnixSocketAddressPrivate)); - gobject_class->set_property = g_unix_socket_address_set_property; gobject_class->get_property = g_unix_socket_address_get_property; @@ -305,9 +304,7 @@ g_unix_socket_address_class_init (GUnixSocketAddressClass *klass) static void g_unix_socket_address_init (GUnixSocketAddress *address) { - address->priv = G_TYPE_INSTANCE_GET_PRIVATE (address, - G_TYPE_UNIX_SOCKET_ADDRESS, - GUnixSocketAddressPrivate); + address->priv = g_unix_socket_address_get_private (address); memset (address->priv->path, 0, sizeof (address->priv->path)); address->priv->path_len = -1; |