From dfe76cf65e6f20d5f9c92982a241ffecf6bb3405 Mon Sep 17 00:00:00 2001
From: Alexander Lantsev <aunsane@gmail.com>
Date: Wed, 4 Feb 2015 19:24:57 +0000
Subject: 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
---
 protocols/Tox/Tox_12.vcxproj         |   3 +++
 protocols/Tox/Tox_12.vcxproj.filters |  12 +++++++++++
 protocols/Tox/bin/x64/libtox.dll     | Bin 3959539 -> 3959539 bytes
 protocols/Tox/bin/x86/libtox.dll     | Bin 3301804 -> 3301804 bytes
 protocols/Tox/src/tox_transfer.cpp   |   2 +-
 protocols/Tox/src/tox_transfer.h     |  39 -----------------------------------
 protocols/Tox/src/version.h          |   6 +++---
 7 files changed, 19 insertions(+), 43 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Tox/Tox_12.vcxproj b/protocols/Tox/Tox_12.vcxproj
index c29ce07566..b36a9cfdb1 100644
--- a/protocols/Tox/Tox_12.vcxproj
+++ b/protocols/Tox/Tox_12.vcxproj
@@ -197,6 +197,9 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="include\tox.h" />
+    <ClInclude Include="include\toxdns.h" />
+    <ClInclude Include="include\toxencryptsave.h" />
     <ClInclude Include="src\common.h" />
     <ClInclude Include="src\resource.h" />
     <ClInclude Include="src\tox_address.h" />
diff --git a/protocols/Tox/Tox_12.vcxproj.filters b/protocols/Tox/Tox_12.vcxproj.filters
index 0a3ec927ab..6af6a29155 100644
--- a/protocols/Tox/Tox_12.vcxproj.filters
+++ b/protocols/Tox/Tox_12.vcxproj.filters
@@ -13,6 +13,9 @@
     <Filter Include="Source Files\api">
       <UniqueIdentifier>{87c3094c-c0d1-4179-856d-55d02a4450cc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\api">
+      <UniqueIdentifier>{7f072eba-bb61-4824-b479-5898b85add0a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\version.h">
@@ -39,6 +42,15 @@
     <ClInclude Include="src\tox_address.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\tox.h">
+      <Filter>Header Files\api</Filter>
+    </ClInclude>
+    <ClInclude Include="include\toxdns.h">
+      <Filter>Header Files\api</Filter>
+    </ClInclude>
+    <ClInclude Include="include\toxencryptsave.h">
+      <Filter>Header Files\api</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\tox_proto.cpp">
diff --git a/protocols/Tox/bin/x64/libtox.dll b/protocols/Tox/bin/x64/libtox.dll
index dfe99f697f..c3464e820c 100644
Binary files a/protocols/Tox/bin/x64/libtox.dll and b/protocols/Tox/bin/x64/libtox.dll differ
diff --git a/protocols/Tox/bin/x86/libtox.dll b/protocols/Tox/bin/x86/libtox.dll
index dca28deeaa..1c7b9e98a6 100644
Binary files a/protocols/Tox/bin/x86/libtox.dll and b/protocols/Tox/bin/x86/libtox.dll differ
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"
-- 
cgit v1.2.3