Skip to content

Commit

Permalink
Fixed an api inconsistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
irungentoo committed Mar 21, 2014
1 parent d013673 commit 2e48b31
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion auto_tests/tox_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void print_nickchange(Tox *m, int friendnumber, uint8_t *string, uint16_t length

uint32_t typing_changes;

void print_typingchange(Tox *m, int friendnumber, int typing, void *userdata)
void print_typingchange(Tox *m, int friendnumber, uint8_t typing, void *userdata)
{
if (*((uint32_t *)userdata) != 974536)
return;
Expand Down
2 changes: 1 addition & 1 deletion toxcore/Messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int32_t,
m->friend_userstatuschange_userdata = userdata;
}

void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int32_t, int, void *), void *userdata)
void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int32_t, uint8_t, void *), void *userdata)
{
m->friend_typingchange = function;
m->friend_typingchange_userdata = userdata;
Expand Down
6 changes: 3 additions & 3 deletions toxcore/Messenger.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ typedef struct Messenger {
void *friend_statusmessagechange_userdata;
void (*friend_userstatuschange)(struct Messenger *m, int32_t, uint8_t, void *);
void *friend_userstatuschange_userdata;
void (*friend_typingchange)(struct Messenger *m, int32_t, int, void *);
void (*friend_typingchange)(struct Messenger *m, int32_t, uint8_t, void *);
void *friend_typingchange_userdata;
void (*read_receipt)(struct Messenger *m, int32_t, uint32_t, void *);
void *read_receipt_userdata;
Expand Down Expand Up @@ -478,9 +478,9 @@ void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, int32
void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int32_t, uint8_t, void *), void *userdata);

/* Set the callback for typing changes.
* Function(int32_t friendnumber, int is_typing)
* Function(int32_t friendnumber, uint8_t is_typing)
*/
void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int32_t, int, void *), void *userdata);
void m_callback_typingchange(Messenger *m, void(*function)(Messenger *m, int32_t, uint8_t, void *), void *userdata);

/* Set the callback for read receipts.
* Function(int32_t friendnumber, uint32_t receipt)
Expand Down
4 changes: 2 additions & 2 deletions toxcore/tox.c
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,9 @@ void tox_callback_user_status(Tox *tox, void (*function)(Messenger *tox, int32_t
}

/* Set the callback for typing changes.
* function (int32_t friendnumber, int is_typing)
* function (int32_t friendnumber, uint8_t is_typing)
*/
void tox_callback_typing_change(Tox *tox, void (*function)(Messenger *tox, int32_t, int, void *), void *userdata)
void tox_callback_typing_change(Tox *tox, void (*function)(Messenger *tox, int32_t, uint8_t, void *), void *userdata)
{
Messenger *m = tox;
m_callback_typingchange(m, function, userdata);
Expand Down
4 changes: 2 additions & 2 deletions toxcore/tox.h
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,9 @@ void tox_callback_status_message(Tox *tox, void (*function)(Tox *tox, int32_t, u
void tox_callback_user_status(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t, void *), void *userdata);

/* Set the callback for typing changes.
* function (Tox *tox, int32_t friendnumber, int is_typing, void *userdata)
* function (Tox *tox, int32_t friendnumber, uint8_t is_typing, void *userdata)
*/
void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int32_t, int, void *), void *userdata);
void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t, void *), void *userdata);

/* Set the callback for read receipts.
* function(Tox *tox, int32_t friendnumber, uint32_t receipt, void *userdata)
Expand Down

0 comments on commit 2e48b31

Please sign in to comment.