summaryrefslogtreecommitdiff
path: root/protocols/Tox/src
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2015-07-15 21:13:56 +0000
committerAlexander Lantsev <aunsane@gmail.com>2015-07-15 21:13:56 +0000
commit31591520f0dfefa04a9e4379f1a25be80298ea1e (patch)
treece2ac6015655c9992b872c830deab7160a3553a8 /protocols/Tox/src
parentde98f325061f64cc3be923aa8bb8f5a619711549 (diff)
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
Diffstat (limited to 'protocols/Tox/src')
-rw-r--r--protocols/Tox/src/tox_contacts.cpp3
-rw-r--r--protocols/Tox/src/tox_search.cpp1
-rw-r--r--protocols/Tox/src/version.h2
3 files changed, 1 insertions, 5 deletions
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>