Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-08 09:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge with master branch

Browse Source
This commit is contained in:
Jfreegman
2016-09-24 23:31:20 -04:00
parent 76bfa34c45 3515623159
commit c6f2a9cb59
58 changed files with 2444 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/file_transfers.h
View File

@@ -61,8 +61,8 @@ struct FileTransfer {
size_t index;
uint64_t file_size;
uint64_t position;
uint64_t last_line_progress; /* The last time we updated the progress bar */
uint64_t last_keep_alive; /* The last time we sent or received data */
time_t last_line_progress; /* The last time we updated the progress bar */
time_t last_keep_alive; /* The last time we sent or received data */
uint32_t line_id;
uint8_t file_id[TOX_FILE_ID_LENGTH];
};
@@ -87,7 +87,7 @@ struct FileTransfer *get_file_transfer_struct(uint32_t friendnum, uint32_t filen
* Returns NULL on failure.
*/
struct FileTransfer *get_file_transfer_struct_index(uint32_t friendnum, uint32_t index,
FILE_TRANSFER_DIRECTION direction);
FILE_TRANSFER_DIRECTION direction);
/* Initializes an unused file transfer and returns its pointer.
* Returns NULL on failure.