diff options
author | Alexander Lantsev <aunsane@gmail.com> | 2014-10-02 18:43:11 +0000 |
---|---|---|
committer | Alexander Lantsev <aunsane@gmail.com> | 2014-10-02 18:43:11 +0000 |
commit | 03fec7536e1a86a3f05246e177d09e10f2e982c3 (patch) | |
tree | 6a01c31106d547e9f27920578a58796d74ab406b /protocols/Tox/src/tox_proto.cpp | |
parent | 3b5b7da07437d95ab397f6b040bf6e375d585f64 (diff) |
Tox: dns name saved as id after search
git-svn-id: http://svn.miranda-ng.org/main/trunk@10669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_proto.cpp')
-rw-r--r-- | protocols/Tox/src/tox_proto.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index 54814135c9..c8e350b46e 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -85,7 +85,7 @@ MCONTACT __cdecl CToxProto::AddToList(int flags, PROTOSEARCHRESULT* psr) return NULL;
}
// set tox address as contact id
- return AddContact(address, flags & PALF_TEMPORARY);
+ return AddContact(address, psr->email, flags & PALF_TEMPORARY);
}
MCONTACT __cdecl CToxProto::AddToListByEvent(int flags, int iContact, HANDLE hDbEvent)
@@ -109,7 +109,7 @@ int __cdecl CToxProto::Authorize(HANDLE hDbEvent) }
db_unset(hContact, "CList", "NotOnList");
- delSetting(hContact, "Auth");
+ delSetting(hContact, "Grant");
SaveToxProfile();
return 0;
@@ -122,7 +122,7 @@ int __cdecl CToxProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre) return Proto_AuthRecv(m_szModuleName, pre);
}
-int __cdecl CToxProto::AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage)
+int __cdecl CToxProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage)
{
ptrA reason(mir_utf8encodeW(szMessage));
@@ -138,7 +138,7 @@ int __cdecl CToxProto::AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage setString(hContact, TOX_SETTINGS_ID, id.c_str());
db_unset(hContact, "CList", "NotOnList");
- delSetting(hContact, "Auth");
+ delSetting(hContact, "Grant");
std::string nick("", TOX_MAX_NAME_LENGTH);
tox_get_name(tox, number, (uint8_t*)&nick[0]);
|