diff options
author | irungentoo <irungentoo@gmail.com> | 2014-02-18 11:37:29 -0500 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-02-18 11:37:29 -0500 |
commit | 472ab51bc558e14fd506acb3673e93bb8a1d90ea (patch) | |
tree | 14a2cf5e18cb9c7799b78e1885514233d61cca05 /toxcore/tox.h | |
parent | 4b4507b44fe6cc73dea377c1d8a48b00a48be296 (diff) | |
parent | 5cd5f32576154dfc9282d94651e716af778e923d (diff) |
Merge branch 'master' of https://github.com/Jman012/ProjectTox-Core into Jman012-master
Diffstat (limited to 'toxcore/tox.h')
-rw-r--r-- | toxcore/tox.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/toxcore/tox.h b/toxcore/tox.h index 447a1146..c95a4fd3 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h | |||
@@ -280,6 +280,21 @@ int tox_get_self_status_message(Tox *tox, uint8_t *buf, uint32_t maxlen); | |||
280 | */ | 280 | */ |
281 | TOX_USERSTATUS tox_get_user_status(Tox *tox, int friendnumber); | 281 | TOX_USERSTATUS tox_get_user_status(Tox *tox, int friendnumber); |
282 | TOX_USERSTATUS tox_get_self_user_status(Tox *tox); | 282 | TOX_USERSTATUS tox_get_self_user_status(Tox *tox); |
283 | |||
284 | /* Set our typing status for a friend. | ||
285 | * You are responsible for turning it on or off. | ||
286 | * | ||
287 | * returns 0 on success. | ||
288 | * returns -1 on failure. | ||
289 | */ | ||
290 | int tox_set_user_is_typing(Tox *tox, int friendnumber, uint8_t is_typing); | ||
291 | |||
292 | /* Get the typing status of a friend. | ||
293 | * | ||
294 | * returns 0 if friend is not typing. | ||
295 | * returns 1 if friend is typing. | ||
296 | */ | ||
297 | int tox_get_is_typing(Tox *tox, int friendnumber); | ||
283 | 298 | ||
284 | /* Sets whether we send read receipts for friendnumber. | 299 | /* Sets whether we send read receipts for friendnumber. |
285 | * This function is not lazy, and it will fail if yesno is not (0 or 1). | 300 | * This function is not lazy, and it will fail if yesno is not (0 or 1). |
@@ -335,6 +350,11 @@ void tox_callback_status_message(Tox *tox, void (*function)(Tox *tox, int, uint8 | |||
335 | * function(int friendnumber, USERSTATUS kind) | 350 | * function(int friendnumber, USERSTATUS kind) |
336 | */ | 351 | */ |
337 | void tox_callback_user_status(Tox *tox, void (*function)(Tox *tox, int, TOX_USERSTATUS, void *), void *userdata); | 352 | void tox_callback_user_status(Tox *tox, void (*function)(Tox *tox, int, TOX_USERSTATUS, void *), void *userdata); |
353 | |||
354 | /* Set the callback for typing changes. | ||
355 | * function (int friendnumber, int is_typing) | ||
356 | */ | ||
357 | void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int, int, void *), void *userdata); | ||
338 | 358 | ||
339 | /* Set the callback for read receipts. | 359 | /* Set the callback for read receipts. |
340 | * function(int friendnumber, uint32_t receipt) | 360 | * function(int friendnumber, uint32_t receipt) |