summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-05-14 16:14:47 (GMT)
committerAlexander Larsson <alexl@redhat.com>2009-05-14 16:14:47 (GMT)
commitb6d42bbde3e96f70aecce2b6958da421452e4099 (patch)
tree66654908d10a8f8222d268844a12fbbbaeb7f791
parente8970dd4cdb6ae98ec22fcb9415259668f2d3ef6 (diff)
downloadgnio-b6d42bbde3e96f70aecce2b6958da421452e4099.tar.gz
gnio-b6d42bbde3e96f70aecce2b6958da421452e4099.tar.xz
Update to the new GSocketSourceFunc prototype
-rw-r--r--gio/gsocketclient.c5
-rw-r--r--gio/gsocketinputstream.c7
-rw-r--r--gio/gsocketlistener.c7
-rw-r--r--gio/gsocketoutputstream.c7
4 files changed, 15 insertions, 11 deletions
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 1eb9683..7b270b8 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -146,8 +146,9 @@ g_socket_client_enumerator_callback (GObject *object,
gpointer user_data);
static gboolean
-g_socket_client_socket_callback (GSocketClientAsyncConnectData *data,
- GIOCondition condition)
+g_socket_client_socket_callback (GSocket *socket,
+ GIOCondition condition,
+ GSocketClientAsyncConnectData *data)
{
GError *error = NULL;
diff --git a/gio/gsocketinputstream.c b/gio/gsocketinputstream.c
index 908cbbc..0f9f848 100644
--- a/gio/gsocketinputstream.c
+++ b/gio/gsocketinputstream.c
@@ -115,8 +115,9 @@ g_socket_input_stream_read (GInputStream *stream,
}
static gboolean
-g_socket_input_stream_read_ready (GSocketInputStream *stream,
- GIOCondition condition)
+g_socket_input_stream_read_ready (GSocket *socket,
+ GIOCondition condition,
+ GSocketInputStream *stream)
{
GSimpleAsyncResult *simple;
GError *error = NULL;
@@ -195,7 +196,7 @@ g_socket_input_stream_read_async (GInputStream *stream,
else
{
input_stream->priv->from_mainloop = FALSE;
- g_socket_input_stream_read_ready (input_stream, G_IO_IN);
+ g_socket_input_stream_read_ready (input_stream->priv->socket, G_IO_IN, input_stream);
}
}
diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c
index ed0dfd7..e0ddf17 100644
--- a/gio/gsocketlistener.c
+++ b/gio/gsocketlistener.c
@@ -119,8 +119,9 @@ g_socket_listener_accept (GSocketListener *listener,
}
static gboolean
-g_socket_listener_accept_ready (GSocketListener *listener,
- GIOCondition condition)
+g_socket_listener_accept_ready (GSocket *socket,
+ GIOCondition condition,
+ GSocketListener *listener)
{
GSimpleAsyncResult *simple;
GError *error = NULL;
@@ -200,7 +201,7 @@ g_socket_listener_accept_async (GSocketListener *listener,
else
{
listener->priv->from_mainloop = FALSE;
- g_socket_listener_accept_ready (listener, G_IO_IN);
+ g_socket_listener_accept_ready (listener->priv->socket, G_IO_IN, listener);
}
}
diff --git a/gio/gsocketoutputstream.c b/gio/gsocketoutputstream.c
index ddf7931..b8b94f7 100644
--- a/gio/gsocketoutputstream.c
+++ b/gio/gsocketoutputstream.c
@@ -115,8 +115,9 @@ g_socket_output_stream_write (GOutputStream *stream,
}
static gboolean
-g_socket_output_stream_write_ready (GSocketOutputStream *stream,
- GIOCondition condition)
+g_socket_output_stream_write_ready (GSocket *socket,
+ GIOCondition condition,
+ GSocketOutputStream *stream)
{
GSimpleAsyncResult *simple;
GError *error = NULL;
@@ -195,7 +196,7 @@ g_socket_output_stream_write_async (GOutputStream *stream,
else
{
output_stream->priv->from_mainloop = FALSE;
- g_socket_output_stream_write_ready (output_stream, G_IO_OUT);
+ g_socket_output_stream_write_ready (output_stream->priv->socket, G_IO_OUT, output_stream);
}
}