diff options
author | Jfreegman <jfreegman@gmail.com> | 2016-09-19 11:30:36 -0400 |
---|---|---|
committer | Jfreegman <jfreegman@gmail.com> | 2016-09-21 15:33:55 -0400 |
commit | dd2965a58f8ec95bd61c1a2c8812bd46b83f414c (patch) | |
tree | 3b128f36518ced6ea670302e333bb11aca64ab74 /toxcore/tox.c | |
parent | e59fd26d4987050e474a6de27dd503f32cc7820a (diff) |
Make group callbacks stateless
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r-- | toxcore/tox.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index fa53f35e..93993c53 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -1216,31 +1216,31 @@ void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback) | |||
1216 | callback_file_data(m, callback); | 1216 | callback_file_data(m, callback); |
1217 | } | 1217 | } |
1218 | 1218 | ||
1219 | void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback, void *user_data) | 1219 | void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback) |
1220 | { | 1220 | { |
1221 | Messenger *m = tox; | 1221 | Messenger *m = tox; |
1222 | g_callback_group_invite(m->group_chat_object, (void (*)(Messenger * m, uint32_t, int, const uint8_t *, size_t, | 1222 | g_callback_group_invite(m->group_chat_object, (void (*)(Messenger * m, uint32_t, int, const uint8_t *, size_t, |
1223 | void *))callback, user_data); | 1223 | void *))callback); |
1224 | } | 1224 | } |
1225 | 1225 | ||
1226 | void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback, void *user_data) | 1226 | void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback) |
1227 | { | 1227 | { |
1228 | Messenger *m = tox; | 1228 | Messenger *m = tox; |
1229 | g_callback_group_message(m->group_chat_object, (void (*)(Messenger * m, uint32_t, uint32_t, int, const uint8_t *, | 1229 | g_callback_group_message(m->group_chat_object, (void (*)(Messenger * m, uint32_t, uint32_t, int, const uint8_t *, |
1230 | size_t, void *))callback, user_data); | 1230 | size_t, void *))callback); |
1231 | } | 1231 | } |
1232 | 1232 | ||
1233 | void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback, void *user_data) | 1233 | void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback) |
1234 | { | 1234 | { |
1235 | Messenger *m = tox; | 1235 | Messenger *m = tox; |
1236 | g_callback_group_title(m->group_chat_object, callback, user_data); | 1236 | g_callback_group_title(m->group_chat_object, callback); |
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback, void *user_data) | 1239 | void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback) |
1240 | { | 1240 | { |
1241 | Messenger *m = tox; | 1241 | Messenger *m = tox; |
1242 | g_callback_group_namelistchange(m->group_chat_object, (void (*)(struct Messenger *, int, int, uint8_t, | 1242 | g_callback_group_namelistchange(m->group_chat_object, (void (*)(struct Messenger *, int, int, uint8_t, |
1243 | void *))callback, user_data); | 1243 | void *))callback); |
1244 | } | 1244 | } |
1245 | 1245 | ||
1246 | uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error) | 1246 | uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error) |