diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-27 20:02:52 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-07-09 09:30:02 +0100 |
| commit | 0899ef7cc9cf73824901923143f38bb9b6d224a3 (patch) | |
| tree | 16207a8837da8a89a6f4a1d1a1c23074fd29aa1d /gtk/gtksocket.c | |
| parent | 365919d5f6da0a8648815ca5cf5805fb88c9be16 (diff) | |
| download | gtk+-0899ef7cc9cf73824901923143f38bb9b6d224a3.tar.gz | |
gtk: Use new macros for defining private data
https://bugzilla.gnome.org/show_bug.cgi?id=702996
Diffstat (limited to 'gtk/gtksocket.c')
| -rw-r--r-- | gtk/gtksocket.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index c497f5065e..f87c31dbd1 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -176,7 +176,7 @@ enum { static guint socket_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GtkSocket, gtk_socket, GTK_TYPE_CONTAINER) +G_DEFINE_TYPE_WITH_PRIVATE (GtkSocket, gtk_socket, GTK_TYPE_CONTAINER) static void gtk_socket_finalize (GObject *object) @@ -255,8 +255,6 @@ gtk_socket_class_init (GtkSocketClass *class) _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); - - g_type_class_add_private (gobject_class, sizeof (GtkSocketPrivate)); } static void @@ -264,10 +262,9 @@ gtk_socket_init (GtkSocket *socket) { GtkSocketPrivate *priv; - priv = G_TYPE_INSTANCE_GET_PRIVATE (socket, - GTK_TYPE_SOCKET, - GtkSocketPrivate); + priv = gtk_socket_get_instance_private (socket); socket->priv = priv; + priv->request_width = 0; priv->request_height = 0; priv->current_width = 0; |