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
This commit is contained in:
Emmanuele Bassi
2013-06-11 00:29:58 +01:00
parent aba80eea6c
commit 32747def4b
76 changed files with 387 additions and 730 deletions

View File

@@ -50,12 +50,18 @@
#include "gthreadedsocketservice.h"
#include "glibintl.h"
struct _GThreadedSocketServicePrivate
{
GThreadPool *thread_pool;
int max_threads;
gint job_count;
};
static guint g_threaded_socket_service_run_signal;
G_DEFINE_TYPE (GThreadedSocketService,
g_threaded_socket_service,
G_TYPE_SOCKET_SERVICE);
G_DEFINE_TYPE_WITH_PRIVATE (GThreadedSocketService,
g_threaded_socket_service,
G_TYPE_SOCKET_SERVICE)
enum
{
@@ -63,16 +69,8 @@ enum
PROP_MAX_THREADS
};
G_LOCK_DEFINE_STATIC(job_count);
struct _GThreadedSocketServicePrivate
{
GThreadPool *thread_pool;
int max_threads;
gint job_count;
};
typedef struct
{
GThreadedSocketService *service;
@@ -136,9 +134,7 @@ g_threaded_socket_service_incoming (GSocketService *service,
static void
g_threaded_socket_service_init (GThreadedSocketService *service)
{
service->priv = G_TYPE_INSTANCE_GET_PRIVATE (service,
G_TYPE_THREADED_SOCKET_SERVICE,
GThreadedSocketServicePrivate);
service->priv = g_threaded_socket_service_get_private (service);
service->priv->max_threads = 10;
}
@@ -212,8 +208,6 @@ g_threaded_socket_service_class_init (GThreadedSocketServiceClass *class)
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GSocketServiceClass *ss_class = &class->parent_class;
g_type_class_add_private (class, sizeof (GThreadedSocketServicePrivate));
gobject_class->constructed = g_threaded_socket_service_constructed;
gobject_class->finalize = g_threaded_socket_service_finalize;
gobject_class->set_property = g_threaded_socket_service_set_property;