diff options
| author | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2012-03-01 21:27:48 -0500 |
|---|---|---|
| committer | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2012-03-01 21:27:48 -0500 |
| commit | 26262bb7da8117df930e8c7073eabda1d145a80e (patch) | |
| tree | 5c31a442f6aaec6733c976a83945742282cf7a7f | |
| parent | bf30b2e9c053d5a331cea65f36b63d66a3610baf (diff) | |
Callback now takes a GSocket * as argument
| -rw-r--r-- | agent/agent.c | 8 | ||||
| -rw-r--r-- | socket/tcp-bsd.c | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/agent/agent.c b/agent/agent.c index 6a96b88..9b36a5a 100644 --- a/agent/agent.c +++ b/agent/agent.c @@ -2586,13 +2586,10 @@ io_ctx_free (IOCtx *ctx) static gboolean nice_agent_g_source_cb ( - GIOChannel *io, - G_GNUC_UNUSED + GSocket *gsocket, GIOCondition condition, gpointer data) { - /* return value is whether to keep the source */ - IOCtx *ctx = data; NiceAgent *agent = ctx->agent; Stream *stream = ctx->stream; @@ -2607,9 +2604,6 @@ nice_agent_g_source_cb ( return FALSE; } - /* note: dear compiler, these are for you: */ - (void)io; - len = _nice_agent_recv (agent, stream, component, ctx->socket, MAX_BUFFER_SIZE, buf); diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c index 10b85a8..72f1b69 100644 --- a/socket/tcp-bsd.c +++ b/socket/tcp-bsd.c @@ -80,7 +80,7 @@ static gboolean socket_is_reliable (NiceSocket *sock); static void add_to_be_sent (NiceSocket *sock, const gchar *buf, guint len, gboolean head); static void free_to_be_sent (struct to_be_sent *tbs); -static gboolean socket_send_more (GIOChannel *source, GIOCondition condition, +static gboolean socket_send_more (GSocket *gsocket, GIOCondition condition, gpointer data); NiceSocket * @@ -313,7 +313,7 @@ socket_is_reliable (NiceSocket *sock) static gboolean socket_send_more ( - GIOChannel *source, + GSocket *gsocket, GIOCondition condition, gpointer data) { |