Tox:

- removed senseless pause command that breaks the transfer
- updated tox core
- version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@14576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 3 insertions, 7 deletions

diff --git a/protocols/Tox/bin/x64/libtox.dll b/protocols/Tox/bin/x64/libtox.dll
index 1295c8d62e..45a14ce04d 100644
--- a/protocols/Tox/bin/x64/libtox.dll
+++ b/protocols/Tox/bin/x64/libtox.dll
diff --git a/protocols/Tox/bin/x64/libtox.pdb b/protocols/Tox/bin/x64/libtox.pdb
index 5020a466ce..921bb2e725 100644
--- a/protocols/Tox/bin/x64/libtox.pdb
+++ b/protocols/Tox/bin/x64/libtox.pdb
diff --git a/protocols/Tox/bin/x86/libtox.dll b/protocols/Tox/bin/x86/libtox.dll
index 1f2aec78e8..7080073528 100644
--- a/protocols/Tox/bin/x86/libtox.dll
+++ b/protocols/Tox/bin/x86/libtox.dll
diff --git a/protocols/Tox/bin/x86/libtox.pdb b/protocols/Tox/bin/x86/libtox.pdb
index 4fe5fb7d12..7e3a852aa8 100644
--- a/protocols/Tox/bin/x86/libtox.pdb
+++ b/protocols/Tox/bin/x86/libtox.pdb
diff --git a/protocols/Tox/include/tox.h b/protocols/Tox/include/tox.h
index f2a27006bc..e483c62e3b 100644
--- a/protocols/Tox/include/tox.h
+++ b/protocols/Tox/include/tox.h
@@ -1282,7 +1282,7 @@ void tox_callback_friend_name(Tox *tox, tox_friend_name_cb *callback, void *user
 size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
 
 /**
- * Write the name of the friend designated by the given friend number to a byte
+ * Write the status message of the friend designated by the given friend number to a byte
  * array.
  *
  * Call tox_friend_get_status_message_size to determine the allocation size for the `status_name`
@@ -1291,7 +1291,7 @@ size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number
  * The data written to `status_message` is equal to the data received by the last
  * `friend_status_message` callback.
  *
- * @param name A valid memory region large enough to store the friend's name.
+ * @param status_message A valid memory region large enough to store the friend's status message.
  */
 bool tox_friend_get_status_message(const Tox *tox, uint32_t friend_number, uint8_t *status_message,
                                    TOX_ERR_FRIEND_QUERY *error);
diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp
index 069f368990..7540961bae 100644
--- a/protocols/Tox/src/tox_contacts.cpp
+++ b/protocols/Tox/src/tox_contacts.cpp
@@ -367,9 +367,6 @@ void CToxProto::OnConnectionStatusChanged(Tox*, uint32_t friendNumber, TOX_CONNE
 		{

 			proto->SetContactStatus(hContact, ID_STATUS_OFFLINE);

 			proto->setDword(hContact, "LastEventDateTS", time(NULL));

-

-			// pause outgoing transfers

-			proto->PauseOutgoingTransfers(friendNumber);

 		}

 	}

 }

diff --git a/protocols/Tox/src/tox_search.cpp b/protocols/Tox/src/tox_search.cpp
index 54e4e09665..8ee770e6e5 100644
--- a/protocols/Tox/src/tox_search.cpp
+++ b/protocols/Tox/src/tox_search.cpp
@@ -192,7 +192,6 @@ HWND CToxProto::OnSearchAdvanced(HWND owner)
 		std::string address = match[1];

 

 		PROTOSEARCHRESULT psr = { sizeof(psr) };

-		psr.flags = PSR_UTF8;

 		psr.id.a = mir_strdup(query.c_str());

 

 		ADDCONTACTSTRUCT acs = { HANDLE_SEARCHRESULT };

diff --git a/protocols/Tox/src/version.h b/protocols/Tox/src/version.h
index 0e925b36f1..2a5dbb12b2 100644
--- a/protocols/Tox/src/version.h
+++ b/protocols/Tox/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION            0

 #define __MINOR_VERSION            11

 #define __RELEASE_NUM              1

-#define __BUILD_NUM                10

+#define __BUILD_NUM                11

 

 #include <stdver.h>