diff options
author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-09-23 10:53:51 +0200 |
---|---|---|
committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-09-23 10:53:51 +0200 |
commit | d1fac4d941aaa9dbf9e72540f97d928af241cb5e (patch) | |
tree | fd360bbafbc5b90bbc088671d0306b38043622a1 /src/cmumble.c | |
parent | e50020020c9770e180735361182e9968249cbfa2 (diff) | |
download | cmumble-d1fac4d941aaa9dbf9e72540f97d928af241cb5e.tar.gz cmumble-d1fac4d941aaa9dbf9e72540f97d928af241cb5e.tar.bz2 cmumble-d1fac4d941aaa9dbf9e72540f97d928af241cb5e.zip |
Store callbacks in context
Diffstat (limited to 'src/cmumble.c')
-rw-r--r-- | src/cmumble.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/cmumble.c b/src/cmumble.c index bb2e934..5cc61c0 100644 --- a/src/cmumble.c +++ b/src/cmumble.c @@ -205,7 +205,12 @@ recv_user_state(MumbleProto__UserState *state, struct context *ctx) ctx->users = g_list_prepend(ctx->users, user); } -static struct mumble_callbacks callbacks = { + +static const struct { +#define MUMBLE_MSG(a,b) void (* a)(MumbleProto__##a *, struct context *); + MUMBLE_MSGS +#undef MUMBLE_MSG +} callbacks = { .Version = recv_version, .UDPTunnel = recv_udp_tunnel, .Authenticate = NULL, @@ -380,8 +385,9 @@ int main(int argc, char **argv) g_type_init(); ctx.loop = g_main_loop_new(NULL, FALSE); + ctx.callbacks = (const callback_t *) &callbacks; - if (cmumble_connection_init(&ctx, host, port, &callbacks) < 0) + if (cmumble_connection_init(&ctx, host, port) < 0) return 1; { |