diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2015-02-04 19:24:57 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2015-02-04 19:24:57 +0000 |
| commit | dfe76cf65e6f20d5f9c92982a241ffecf6bb3405 (patch) | |
| tree | 6cd07d1f07afc71ddbac99a2194fec6087310cf9 /protocols/Tox/src | |
| parent | 2d0cbc078494bbf8f70e68fe629710bbaa30b2e8 (diff) | |
Tox:
- added delay for resending chunk of file
- updated tox core
- version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@12003 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src')
| -rw-r--r-- | protocols/Tox/src/tox_transfer.cpp | 2 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_transfer.h | 39 | ||||
| -rw-r--r-- | protocols/Tox/src/version.h | 6 |
3 files changed, 4 insertions, 43 deletions
diff --git a/protocols/Tox/src/tox_transfer.cpp b/protocols/Tox/src/tox_transfer.cpp index 65a00899ab..a8643d16ea 100644 --- a/protocols/Tox/src/tox_transfer.cpp +++ b/protocols/Tox/src/tox_transfer.cpp @@ -232,7 +232,7 @@ void CToxProto::SendFileAsync(void *arg) if (tox_file_send_data(tox, transfer->friendNumber, transfer->fileNumber, data, dataSize) == TOX_ERROR)
{
locker.unlock();
- //Sleep(100);
+ Sleep(100);
continue;
}
diff --git a/protocols/Tox/src/tox_transfer.h b/protocols/Tox/src/tox_transfer.h index 13120756fb..080d8a2289 100644 --- a/protocols/Tox/src/tox_transfer.h +++ b/protocols/Tox/src/tox_transfer.h @@ -47,45 +47,6 @@ struct FileTransferParam return hFile != NULL;
}
- /*void Start(Tox *tox)
- {
- status = STARTED;
- if (tox_file_send_control(tox, friendNumber, GetDirection(), fileNumber, TOX_FILECONTROL_ACCEPT, NULL, 0))
- {
- Fail(tox);
- }
- }
-
- void Resume(Tox *tox)
- {
- status = STARTED;
- if (tox_file_send_control(tox, friendNumber, GetDirection(), fileNumber, TOX_FILECONTROL_RESUME_BROKEN, (uint8_t*)&pfts.currentFileProgress, sizeof(pfts.currentFileProgress)) == -1)
- {
- Fail(tox);
- }
- }
-
- int Fail(Tox *tox)
- {
- status = FAILED;
- return tox_file_send_control(tox, friendNumber, GetDirection(), fileNumber, TOX_FILECONTROL_KILL, NULL, 0);
- }
-
- int Cancel(Tox *tox)
- {
- status = CANCELED;
- return tox_file_send_control(tox, friendNumber, GetDirection(), fileNumber, TOX_FILECONTROL_KILL, NULL, 0);
- }
-
- void Finish(Tox *tox)
- {
- status = FINISHED;
- if (tox_file_send_control(tox, friendNumber, GetDirection(), fileNumber, TOX_FILECONTROL_FINISHED, NULL, 0))
- {
- Fail(tox);
- }
- }*/
-
void Rename(const TCHAR* fileName)
{
pfts.ptszFiles[0] = replaceStrT(pfts.tszCurrentFile, fileName);
diff --git a/protocols/Tox/src/version.h b/protocols/Tox/src/version.h index 775b7089a0..3edccd9363 100644 --- a/protocols/Tox/src/version.h +++ b/protocols/Tox/src/version.h @@ -1,14 +1,14 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 11
#define __RELEASE_NUM 0
-#define __BUILD_NUM 4
+#define __BUILD_NUM 5
#include <stdver.h>
#define __PLUGIN_NAME "Tox protocol"
#define __FILENAME "Tox.dll"
#define __DESCRIPTION "Tox protocol support for Miranda NG."
-#define __AUTHOR "ForNeVeR, Mataes, unsane"
+#define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/p/Tox/"
-#define __COPYRIGHT "© 2014 Miranda NG Team"
+#define __COPYRIGHT "© 2014-15 Miranda NG Team"
|