summaryrefslogtreecommitdiff
path: root/toxcore/Messenger.c
diff options
context:
space:
mode:
authorGregory Mullen (grayhatter) <greg@grayhatter.com>2016-08-20 15:15:49 -0700
committerGregory Mullen (grayhatter) <greg@grayhatter.com>2016-08-22 02:10:18 -0700
commit3f0c1017714eb8b5114ee5d0caaa5bc453217d09 (patch)
treed5afef4d1828644433db37012b01abd7cf879d1b /toxcore/Messenger.c
parentb044cfbf1509ff45b2d4b0f518dadd8ad7c05046 (diff)
Make Friend User Status stateless
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r--toxcore/Messenger.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index ac885310..ac54f34f 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -786,10 +786,9 @@ void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, uint3
786 m->friend_statusmessagechange = function; 786 m->friend_statusmessagechange = function;
787} 787}
788 788
789void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, void *), void *userdata) 789void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, void *))
790{ 790{
791 m->friend_userstatuschange = function; 791 m->friend_userstatuschange = function;
792 m->friend_userstatuschange_userdata = userdata;
793} 792}
794 793
795void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, uint32_t, _Bool, void *)) 794void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, uint32_t, _Bool, void *))
@@ -1971,7 +1970,7 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len, void
1971 break; 1970 break;
1972 1971
1973 if (m->friend_userstatuschange) 1972 if (m->friend_userstatuschange)
1974 m->friend_userstatuschange(m, i, status, m->friend_userstatuschange_userdata); 1973 m->friend_userstatuschange(m, i, status, userdata);
1975 1974
1976 set_friend_userstatus(m, i, status); 1975 set_friend_userstatus(m, i, status);
1977 break; 1976 break;