diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2015-08-15 10:12:35 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2015-08-15 10:12:35 +0000 |
| commit | 1db4b29d772702e85571b12172f9e3f86bf095b0 (patch) | |
| tree | 566436ce794506776c7faf5e4e364a9dfc2a2dd0 /protocols/Tox | |
| parent | 06d5a34fee26731c821392c594e181cc6d0302e8 (diff) | |
Tox: added search by toxme.io
git-svn-id: http://svn.miranda-ng.org/main/trunk@14957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox')
| -rw-r--r-- | protocols/Tox/docs/tox.ini | 10 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_core.cpp | 4 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_search.cpp | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/protocols/Tox/docs/tox.ini b/protocols/Tox/docs/tox.ini index e9a2f24489..66764036a6 100644 --- a/protocols/Tox/docs/tox.ini +++ b/protocols/Tox/docs/tox.ini @@ -1,13 +1,11 @@ +[Dns_toxme.io]
+Domain=toxme.io
+PubKey=1A39E7A5D5FA9CF155C751570A32E625698A60A55F6D88028F949F66144F4F25
+
[Dns_utox.org]
Domain=utox.org
PubKey=D3154F65D28A5B41A05D4AC7E4B39C6B1C233CC857FB365C56E8392737462A12
-[Node_stqism]
-IPv4=192.254.75.102
-IPv6=2607:5600:284::2
-PubKey=951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
-Port=33445
-
[Node_sonOfRa]
IPv4=144.76.60.215
IPv6=2a01:4f8:191:64d6::1
diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp index 51e7ac70d8..fc5527adec 100644 --- a/protocols/Tox/src/tox_core.cpp +++ b/protocols/Tox/src/tox_core.cpp @@ -77,11 +77,11 @@ bool CToxProto::InitToxCore() uint8_t nick[TOX_MAX_NAME_LENGTH] = { 0 };
tox_self_get_name(tox, nick);
- setWString("Nick", ptrW(Utf8DecodeW((char*)nick)));
+ setTString("Nick", ptrT(Utf8DecodeT((char*)nick)));
uint8_t statusMessage[TOX_MAX_STATUS_MESSAGE_LENGTH] = { 0 };
tox_self_get_status_message(tox, statusMessage);
- setWString("StatusMsg", ptrW(Utf8DecodeW((char*)statusMessage)));
+ setTString("StatusMsg", ptrT(Utf8DecodeT((char*)statusMessage)));
return true;
}
diff --git a/protocols/Tox/src/tox_search.cpp b/protocols/Tox/src/tox_search.cpp index 8ee770e6e5..eee0c009d4 100644 --- a/protocols/Tox/src/tox_search.cpp +++ b/protocols/Tox/src/tox_search.cpp @@ -6,7 +6,7 @@ ToxHexAddress ResolveToxAddressFromDnsRecordV1(const std::string &dnsRecord) std::regex regex("^v=tox1;id=([A-Fa-f0-9]{76})(;sign=(\\S+))?$");
if (std::regex_search(dnsRecord, match, regex))
{
- return match[1];
+ return ToxHexAddress(match[1]);
}
return ToxHexAddress::Empty();
}
@@ -186,7 +186,7 @@ HWND CToxProto::OnSearchAdvanced(HWND owner) TCHAR text[MAX_PATH];
GetDlgItemText(owner, IDC_SEARCH, text, _countof(text));
- const std::string query = T2Utf(text);
+ const std::string query = T2Utf(text).str();
if (std::regex_search(query, match, regex))
{
std::string address = match[1];
|