From ac7da66529884da7db6a72fdf20f02748b849396 Mon Sep 17 00:00:00 2001 From: irungentoo Date: Thu, 5 Mar 2015 12:30:50 -0500 Subject: Code cleanups. Fixed wrong variable used, removed useless elements of struct. --- toxcore/Messenger.c | 4 ++-- toxcore/Messenger.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 8bddd6bc..94cb93dd 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -826,7 +826,7 @@ void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, uint3 void *userdata) { m->friend_statusmessagechange = function; - m->friend_statuschange_userdata = userdata; + m->friend_statusmessagechange_userdata = userdata; } void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, uint8_t, void *), void *userdata) @@ -1654,7 +1654,7 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len) if (m->friend_statusmessagechange) m->friend_statusmessagechange(m, i, data_terminated, data_length, - m->friend_statuschange_userdata); + m->friend_statusmessagechange_userdata); set_friend_statusmessage(m, i, data_terminated, data_length); break; diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h index 541894ab..67c2358d 100644 --- a/toxcore/Messenger.h +++ b/toxcore/Messenger.h @@ -236,8 +236,6 @@ struct Messenger { void *friend_typingchange_userdata; void (*read_receipt)(struct Messenger *m, uint32_t, uint32_t, void *); void *read_receipt_userdata; - void (*friend_statuschange)(struct Messenger *m, uint32_t, uint8_t, void *); - void *friend_statuschange_userdata; void (*friend_connectionstatuschange)(struct Messenger *m, uint32_t, uint8_t, void *); void *friend_connectionstatuschange_userdata; void (*friend_connectionstatuschange_internal)(struct Messenger *m, uint32_t, uint8_t, void *); -- cgit v1.2.3