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/gsocketlistener.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/gsocketlistener.c')
| -rw-r--r-- | gio/gsocketlistener.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c index 7af0d14f8..4a55e4d23 100644 --- a/gio/gsocketlistener.c +++ b/gio/gsocketlistener.c @@ -56,8 +56,6 @@ * Since: 2.22 */ -G_DEFINE_TYPE (GSocketListener, g_socket_listener, G_TYPE_OBJECT); - enum { PROP_0, @@ -75,6 +73,8 @@ struct _GSocketListenerPrivate guint closed : 1; }; +G_DEFINE_TYPE_WITH_PRIVATE (GSocketListener, g_socket_listener, G_TYPE_OBJECT) + static void g_socket_listener_finalize (GObject *object) { @@ -136,8 +136,6 @@ g_socket_listener_class_init (GSocketListenerClass *klass) { GObjectClass *gobject_class G_GNUC_UNUSED = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (GSocketListenerPrivate)); - gobject_class->finalize = g_socket_listener_finalize; gobject_class->set_property = g_socket_listener_set_property; gobject_class->get_property = g_socket_listener_get_property; @@ -156,9 +154,7 @@ g_socket_listener_class_init (GSocketListenerClass *klass) static void g_socket_listener_init (GSocketListener *listener) { - listener->priv = G_TYPE_INSTANCE_GET_PRIVATE (listener, - G_TYPE_SOCKET_LISTENER, - GSocketListenerPrivate); + listener->priv = g_socket_listener_get_private (listener); listener->priv->sockets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); listener->priv->listen_backlog = 10; |