summaryrefslogtreecommitdiff
path: root/toxcore/tox.h
diff options
context:
space:
mode:
authorDubslow <bunslow@gmail.com>2015-03-13 12:34:14 -0500
committerDubslow <bunslow@gmail.com>2015-03-13 12:34:14 -0500
commit64fefb6f43e9213db9f3313aa7e8af7c36bf8538 (patch)
tree9e5aafc9fd093e2e9ea62d689493e22b191051d2 /toxcore/tox.h
parent3bf259f69d408dc5c380383ee3c0cde0504e9f02 (diff)
revert to TOX_FILE_KIND
Diffstat (limited to 'toxcore/tox.h')
-rw-r--r--toxcore/tox.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 96969c43..7093a232 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -1390,12 +1390,12 @@ void tox_callback_friend_action(Tox *tox, tox_friend_action_cb *function, void *
1390 ******************************************************************************/ 1390 ******************************************************************************/
1391 1391
1392 1392
1393typedef enum TOX_FILE_TYPE { 1393typedef enum TOX_FILE_KIND {
1394 /** 1394 /**
1395 * Arbitrary file data. Clients can choose to handle it based on the file name 1395 * Arbitrary file data. Clients can choose to handle it based on the file name
1396 * or magic or any other way they choose. 1396 * or magic or any other way they choose.
1397 */ 1397 */
1398 TOX_FILE_TYPE_DATA, 1398 TOX_FILE_KIND_DATA,
1399 /** 1399 /**
1400 * Avatar data. This consists of tox_hash(image) + image. 1400 * Avatar data. This consists of tox_hash(image) + image.
1401 * 1401 *
@@ -1412,8 +1412,8 @@ typedef enum TOX_FILE_TYPE {
1412 * saved hash and send TOX_FILE_CONTROL_CANCEL to terminate the avatar 1412 * saved hash and send TOX_FILE_CONTROL_CANCEL to terminate the avatar
1413 * transfer if it matches. 1413 * transfer if it matches.
1414 */ 1414 */
1415 TOX_FILE_TYPE_AVATAR 1415 TOX_FILE_KIND_AVATAR
1416} TOX_FILE_TYPE; 1416} TOX_FILE_KIND;
1417 1417
1418 1418
1419/** 1419/**
@@ -1618,7 +1618,7 @@ typedef enum TOX_ERR_FILE_SEND {
1618 * number is per friend. File numbers are reused after a transfer terminates. 1618 * number is per friend. File numbers are reused after a transfer terminates.
1619 * on failure, this function returns UINT32_MAX. 1619 * on failure, this function returns UINT32_MAX.
1620 */ 1620 */
1621uint32_t tox_file_send(Tox *tox, uint32_t friend_number, TOX_FILE_TYPE kind, uint64_t file_size, 1621uint32_t tox_file_send(Tox *tox, uint32_t friend_number, TOX_FILE_KIND kind, uint64_t file_size,
1622 const uint8_t *filename, size_t filename_length, TOX_ERR_FILE_SEND *error); 1622 const uint8_t *filename, size_t filename_length, TOX_ERR_FILE_SEND *error);
1623 1623
1624 1624
@@ -1731,7 +1731,7 @@ void tox_callback_file_request_chunk(Tox *tox, tox_file_request_chunk_cb *functi
1731 * @param file_number The friend-specific file number the data received is 1731 * @param file_number The friend-specific file number the data received is
1732 * associated with. 1732 * associated with.
1733 */ 1733 */
1734typedef void tox_file_receive_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_TYPE kind, 1734typedef void tox_file_receive_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_KIND kind,
1735 uint64_t file_size, const uint8_t *filename, size_t filename_length, void *user_data); 1735 uint64_t file_size, const uint8_t *filename, size_t filename_length, void *user_data);
1736 1736
1737/** 1737/**