summaryrefslogtreecommitdiff
path: root/src/connection.c
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-09-23 10:53:51 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-09-23 10:53:51 +0200
commitd1fac4d941aaa9dbf9e72540f97d928af241cb5e (patch)
treefd360bbafbc5b90bbc088671d0306b38043622a1 /src/connection.c
parente50020020c9770e180735361182e9968249cbfa2 (diff)
downloadcmumble-d1fac4d941aaa9dbf9e72540f97d928af241cb5e.tar.gz
cmumble-d1fac4d941aaa9dbf9e72540f97d928af241cb5e.tar.bz2
cmumble-d1fac4d941aaa9dbf9e72540f97d928af241cb5e.zip
Store callbacks in context
Diffstat (limited to 'src/connection.c')
-rw-r--r--src/connection.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/connection.c b/src/connection.c
index 3494d08..7cb48e6 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -12,7 +12,7 @@ read_cb(GObject *pollable_stream, gpointer data)
gint count;
do {
- count = recv_msg(ctx, ctx->con.callbacks);
+ count = recv_msg(ctx);
} while (count && g_pollable_input_stream_is_readable(input));
return TRUE;
@@ -46,13 +46,11 @@ setup_ping_timer(struct context *ctx)
int
cmumble_connection_init(struct context *ctx,
- const char *host, int port,
- struct mumble_callbacks *callbacks)
+ const char *host, int port)
{
struct cmumble_connection *con = &ctx->con;
GError *error = NULL;
- con->callbacks = callbacks;
con->sock_client = g_socket_client_new();
g_socket_client_set_tls(con->sock_client, TRUE);
g_socket_client_set_tls_validation_flags(con->sock_client,