summaryrefslogtreecommitdiff
path: root/protocols/Tox/src/tox_proto.cpp
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2015-05-31 19:00:56 +0000
committerAlexander Lantsev <aunsane@gmail.com>2015-05-31 19:00:56 +0000
commite5d977a8e28a301ea56e2786756537d03b84540a (patch)
tree1a225e4ce7dcb3bfbb6a2aebd6c1b01ff5e73a45 /protocols/Tox/src/tox_proto.cpp
parent6a08d8f762284e3ad8ddc2307287bef8a261989d (diff)
Tox: fixed contact adding
git-svn-id: http://svn.miranda-ng.org/main/trunk@13948 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_proto.cpp')
-rw-r--r--protocols/Tox/src/tox_proto.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp
index 7ec780634d..da29ff9e02 100644
--- a/protocols/Tox/src/tox_proto.cpp
+++ b/protocols/Tox/src/tox_proto.cpp
@@ -63,21 +63,18 @@ DWORD_PTR CToxProto::GetCaps(int type, MCONTACT)
MCONTACT CToxProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
{
- ptrA address(mir_t2a(psr->id.t));
ptrA myAddress(getStringA(NULL, TOX_SETTINGS_ID));
- if (strnicmp(address, myAddress, TOX_PUBLIC_KEY_SIZE) == 0)
+ if (strnicmp(psr->id.a, myAddress, TOX_PUBLIC_KEY_SIZE) == 0)
{
ShowNotification(TranslateT("You cannot add yourself to your contact list"), 0);
return NULL;
}
- if (MCONTACT hContact = GetContact((char*)address))
+ if (MCONTACT hContact = GetContact(psr->id.a))
{
ShowNotification(TranslateT("Contact already in your contact list"), 0, hContact);
return NULL;
}
- ptrT nick(mir_tstrdup(psr->nick.t));
- ptrT dnsId(mir_tstrdup(psr->email.t));
- return AddContact(address, nick, dnsId, flags & PALF_TEMPORARY);
+ return AddContact(psr->id.a, psr->nick.a, psr->email.a, flags & PALF_TEMPORARY);
}
int CToxProto::Authorize(MEVENT hDbEvent)