summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJman012 <jman012guy@gmail.com>2014-02-16 17:14:22 -0800
committerJman012 <jman012guy@gmail.com>2014-02-16 17:14:22 -0800
commit5cd5f32576154dfc9282d94651e716af778e923d (patch)
tree9cffa8d3a90ca0565e9303ad315c3dba9b43dcfc
parent32afb6b1e45bd1828214a1f8f5d0f51af9e17bab (diff)
Typing: Forgot the callback argument types.
-rw-r--r--toxcore/Messenger.c2
-rw-r--r--toxcore/Messenger.h6
-rw-r--r--toxcore/tox.c6
-rw-r--r--toxcore/tox.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 42c8544a..cca397d7 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -743,7 +743,7 @@ void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USE
743 m->friend_userstatuschange_userdata = userdata; 743 m->friend_userstatuschange_userdata = userdata;
744} 744}
745 745
746void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int, uint8_t, void *), void *userdata) 746void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int, int, void *), void *userdata)
747{ 747{
748 m->friend_typingchange = function; 748 m->friend_typingchange = function;
749 m->friend_typingchange_userdata = userdata; 749 m->friend_typingchange_userdata = userdata;
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index d931dfb5..e6851800 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -208,7 +208,7 @@ typedef struct Messenger {
208 void *friend_statusmessagechange_userdata; 208 void *friend_statusmessagechange_userdata;
209 void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS, void *); 209 void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS, void *);
210 void *friend_userstatuschange_userdata; 210 void *friend_userstatuschange_userdata;
211 void (*friend_typingchange)(struct Messenger *m, int, uint8_t, void *); 211 void (*friend_typingchange)(struct Messenger *m, int, int, void *);
212 void *friend_typingchange_userdata; 212 void *friend_typingchange_userdata;
213 void (*read_receipt)(struct Messenger *m, int, uint32_t, void *); 213 void (*read_receipt)(struct Messenger *m, int, uint32_t, void *);
214 void *read_receipt_userdata; 214 void *read_receipt_userdata;
@@ -461,9 +461,9 @@ void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, int,
461void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USERSTATUS, void *), void *userdata); 461void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USERSTATUS, void *), void *userdata);
462 462
463/* Set the callback for typing changes. 463/* Set the callback for typing changes.
464 * Function(int friendnumber, uint8_t is_typing) 464 * Function(int friendnumber, int is_typing)
465 */ 465 */
466void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int, uint8_t, void *), void *userdata); 466void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int, int, void *), void *userdata);
467 467
468/* Set the callback for read receipts. 468/* Set the callback for read receipts.
469 * Function(int friendnumber, uint32_t receipt) 469 * Function(int friendnumber, uint32_t receipt)
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 8ec98cc8..bdef1eaa 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -394,12 +394,12 @@ void tox_callback_user_status(Tox *tox, void (*_function)(Tox *tox, int, TOX_USE
394} 394}
395 395
396/* Set the callback for typing changes. 396/* Set the callback for typing changes.
397 * function (int friendnumber, uint8_t is_typing) 397 * function (int friendnumber, int is_typing)
398 */ 398 */
399void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int, uint8_t, void *), void *userdata) 399void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int, int, void *), void *userdata)
400{ 400{
401 Messenger *m = tox; 401 Messenger *m = tox;
402 typedef void (*function_type)(Messenger *, int, uint8_t, void *); 402 typedef void (*function_type)(Messenger *, int, int, void *);
403 function_type function_new = (function_type)function; 403 function_type function_new = (function_type)function;
404 m_callback_typingchange(m, function_new, userdata); 404 m_callback_typingchange(m, function_new, userdata);
405} 405}
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 72589142..c95a4fd3 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -352,9 +352,9 @@ void tox_callback_status_message(Tox *tox, void (*function)(Tox *tox, int, uint8
352void tox_callback_user_status(Tox *tox, void (*function)(Tox *tox, int, TOX_USERSTATUS, void *), void *userdata); 352void tox_callback_user_status(Tox *tox, void (*function)(Tox *tox, int, TOX_USERSTATUS, void *), void *userdata);
353 353
354/* Set the callback for typing changes. 354/* Set the callback for typing changes.
355 * function (int friendnumber, uint8_t is_typing) 355 * function (int friendnumber, int is_typing)
356 */ 356 */
357void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int, uint8_t, void *), void *userdata); 357void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int, int, void *), void *userdata);
358 358
359/* Set the callback for read receipts. 359/* Set the callback for read receipts.
360 * function(int friendnumber, uint32_t receipt) 360 * function(int friendnumber, uint32_t receipt)