From 5de53491d607c38286b19989ba7182454f24fabc Mon Sep 17 00:00:00 2001 From: aunsane Date: Wed, 15 Mar 2017 00:19:35 +0300 Subject: Tox: - tox_network.cpp splitted on two logical parts - tox network status checking moved to separated thread - started rejection of toxThread wrapper --- protocols/Tox/src/tox_messages.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/Tox/src/tox_messages.cpp') diff --git a/protocols/Tox/src/tox_messages.cpp b/protocols/Tox/src/tox_messages.cpp index b1c6ef7d3d..471db3b23f 100644 --- a/protocols/Tox/src/tox_messages.cpp +++ b/protocols/Tox/src/tox_messages.cpp @@ -3,11 +3,11 @@ /* MESSAGE RECEIVING */ // incoming message flow -void CToxProto::OnFriendMessage(Tox*, uint32_t friendNumber, TOX_MESSAGE_TYPE type, const uint8_t *message, size_t length, void *arg) +void CToxProto::OnFriendMessage(Tox *tox, uint32_t friendNumber, TOX_MESSAGE_TYPE type, const uint8_t *message, size_t length, void *arg) { CToxProto *proto = (CToxProto*)arg; - MCONTACT hContact = proto->GetContact(friendNumber); + MCONTACT hContact = proto->GetContact(tox, friendNumber); if (hContact == NULL) return; @@ -94,11 +94,11 @@ int CToxProto::OnSendMessage(MCONTACT hContact, const char *szMessage) } // message is received by the other side -void CToxProto::OnReadReceipt(Tox*, uint32_t friendNumber, uint32_t messageNumber, void *arg) +void CToxProto::OnReadReceipt(Tox *tox, uint32_t friendNumber, uint32_t messageNumber, void *arg) { CToxProto *proto = (CToxProto*)arg; - MCONTACT hContact = proto->GetContact(friendNumber); + MCONTACT hContact = proto->GetContact(tox, friendNumber); if (hContact == NULL) return; @@ -177,11 +177,11 @@ int CToxProto::OnUserIsTyping(MCONTACT hContact, int type) return 0; } -void CToxProto::OnTypingChanged(Tox*, uint32_t friendNumber, bool isTyping, void *arg) +void CToxProto::OnTypingChanged(Tox *tox, uint32_t friendNumber, bool isTyping, void *arg) { CToxProto *proto = (CToxProto*)arg; - if (MCONTACT hContact = proto->GetContact(friendNumber)) + if (MCONTACT hContact = proto->GetContact(tox, friendNumber)) { int typingStatus = (isTyping ? PROTOTYPE_CONTACTTYPING_INFINITE : PROTOTYPE_CONTACTTYPING_OFF); CallService(MS_PROTO_CONTACTISTYPING, hContact, (LPARAM)typingStatus); -- cgit v1.2.3