gdbus-tool: simplify some logic

[platform/upstream/glib.git] / gio / gtcpconnection.c

diff --git a/gio/gtcpconnection.c b/gio/gtcpconnection.c
index 00fb059..8ff355d 100644 (file)
--- a/gio/gtcpconnection.c
+++ b/gio/gtcpconnection.c
@@ -14,6 +14,7 @@
  * SECTION:gtcpconnection
  * @title: GTcpConnection
  * @short_description: A TCP GSocketConnection
+ * @include: gio/gio.h
  * @see_also: #GSocketConnection.
  *
  * This is the subclass of #GSocketConnection that is created
@@ -29,9 +30,14 @@
 #include "giostream.h"
 #include "glibintl.h"
 
+struct _GTcpConnectionPrivate
+{
+  guint graceful_disconnect : 1;
+};
 
 G_DEFINE_TYPE_WITH_CODE (GTcpConnection, g_tcp_connection,
                         G_TYPE_SOCKET_CONNECTION,
+                         G_ADD_PRIVATE (GTcpConnection)
   g_socket_connection_factory_register_type (g_define_type_id,
                                             G_SOCKET_FAMILY_IPV4,
                                             G_SOCKET_TYPE_STREAM,
@@ -59,11 +65,6 @@ static void     g_tcp_connection_close_async (GIOStream            *stream,
                                              GAsyncReadyCallback   callback,
                                              gpointer              user_data);
 
-struct _GTcpConnectionPrivate
-{
-  guint graceful_disconnect : 1;
-};
-
 
 enum
 {
@@ -74,9 +75,7 @@ enum
 static void
 g_tcp_connection_init (GTcpConnection *connection)
 {
-  connection->priv = G_TYPE_INSTANCE_GET_PRIVATE (connection,
-                                                  G_TYPE_TCP_CONNECTION,
-                                                  GTcpConnectionPrivate);
+  connection->priv = g_tcp_connection_get_instance_private (connection);
   connection->priv->graceful_disconnect = FALSE;
 }
 
@@ -125,8 +124,6 @@ g_tcp_connection_class_init (GTcpConnectionClass *class)
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GIOStreamClass *stream_class = G_IO_STREAM_CLASS (class);
 
-  g_type_class_add_private (class, sizeof (GTcpConnectionPrivate));
-
   gobject_class->set_property = g_tcp_connection_set_property;
   gobject_class->get_property = g_tcp_connection_get_property;
 
@@ -292,7 +289,7 @@ g_tcp_connection_close_async (GIOStream           *stream,
  * @connection: a #GTcpConnection
  * @graceful_disconnect: Whether to do graceful disconnects or not
  *
- * This enabled graceful disconnects on close. A graceful disconnect
+ * This enables graceful disconnects on close. A graceful disconnect
  * means that we signal the receiving end that the connection is terminated
  * and wait for it to close the connection before closing the connection.
  *