[gnio/connection-factory: 5/6] Use the common socket connection factory for GSocketClient
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnio/connection-factory: 5/6] Use the common socket connection factory for GSocketClient
- Date: Fri, 8 May 2009 10:25:58 -0400 (EDT)
commit a1579ce9d1a0ae6417d7abf8a0711b17242cb2cf
Author: Alexander Larsson <alexl redhat com>
Date: Fri May 8 15:01:34 2009 +0200
Use the common socket connection factory for GSocketClient
---
gio/gsocketclient.c | 5 ++---
gio/gsocketclient.h | 2 --
gio/gtcpclient.c | 8 --------
gio/gunixclient.c | 8 --------
4 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index ae6dd86..e12ead8 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -89,7 +89,7 @@ g_socket_client_connect (GSocketClient *client,
if (socket != NULL)
{
if (g_socket_connect (socket, address, error))
- connection = class->connection_factory (client, socket);
+ connection = g_socket_connection_factory_create_connection (socket);
}
g_object_unref (address);
@@ -128,8 +128,7 @@ g_socket_client_async_connect_complete (GSocketClientAsyncConnectData *data)
{
g_assert (data->current_socket);
class = G_SOCKET_CLIENT_GET_CLASS (data->client);
- connection = class->connection_factory (data->client,
- data->current_socket);
+ connection = g_socket_connection_factory_create_connection (data->current_socket);
g_simple_async_result_set_op_res_gpointer (data->result,
g_object_ref (connection),
g_object_unref);
diff --git a/gio/gsocketclient.h b/gio/gsocketclient.h
index 014633a..cef9e99 100644
--- a/gio/gsocketclient.h
+++ b/gio/gsocketclient.h
@@ -43,8 +43,6 @@ struct _GSocketClientClass
{
GObjectClass parent_class;
- GSocketConnection * (* connection_factory) (GSocketClient *client,
- GSocket *socket);
GSocket * (* socket_factory) (GSocketClient *client,
GSocketAddress *address,
GError **error);
diff --git a/gio/gtcpclient.c b/gio/gtcpclient.c
index 19df7ab..3ca2e08 100644
--- a/gio/gtcpclient.c
+++ b/gio/gtcpclient.c
@@ -621,13 +621,6 @@ g_tcp_client_connect_to_service_finish (GTcpClient *client,
return g_tcp_client_connect_finish (client, result, error);
}
-static GSocketConnection *
-g_tcp_client_connection_factory (GSocketClient *client,
- GSocket *socket)
-{
- return g_object_new (G_TYPE_TCP_CONNECTION, "socket", socket, NULL);
-}
-
static GSocket *
g_tcp_client_socket_factory (GSocketClient *client,
GSocketAddress *address,
@@ -647,7 +640,6 @@ g_tcp_client_class_init (GTcpClientClass *class)
{
GSocketClientClass *sc_class = G_SOCKET_CLIENT_CLASS (class);
- sc_class->connection_factory = g_tcp_client_connection_factory;
sc_class->socket_factory = g_tcp_client_socket_factory;
}
diff --git a/gio/gunixclient.c b/gio/gunixclient.c
index f2229b9..3391d6d 100644
--- a/gio/gunixclient.c
+++ b/gio/gunixclient.c
@@ -150,13 +150,6 @@ g_unix_client_connect_to_path_finish (GUnixClient *client,
return g_unix_client_connect_finish (client, result, error);
}
-static GSocketConnection *
-g_unix_client_connection_factory (GSocketClient *client,
- GSocket *socket)
-{
- return g_object_new (G_TYPE_UNIX_CONNECTION, "socket", socket, NULL);
-}
-
static GSocket *
g_unix_client_socket_factory (GSocketClient *client,
GSocketAddress *address,
@@ -176,7 +169,6 @@ g_unix_client_class_init (GUnixClientClass *class)
{
GSocketClientClass *sc_class = G_SOCKET_CLIENT_CLASS (class);
- sc_class->connection_factory = g_unix_client_connection_factory;
sc_class->socket_factory = g_unix_client_socket_factory;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]