From 1ce3da1cca093143d9629bc46e221dd8be962e12 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 May 2015 11:46:05 +0000 Subject: - MAllStrings: a handy union to hold an incoming string parameter of any type; - FNAMECHAR: atavism extincted; - PROTOSEARCHRESULT: structure prepared to use results of any type, including utf git-svn-id: http://svn.miranda-ng.org/main/trunk@13932 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/src/contacts.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/Twitter/src') diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp index e58c6ee01f..99e954b5f2 100644 --- a/protocols/Twitter/src/contacts.cpp +++ b/protocols/Twitter/src/contacts.cpp @@ -44,13 +44,13 @@ void TwitterProto::AddToListWorker(void *p) mir_free(name); } -MCONTACT TwitterProto::AddToList(int, PROTOSEARCHRESULT *result) +MCONTACT TwitterProto::AddToList(int, PROTOSEARCHRESULT *psr) { if (m_iStatus != ID_STATUS_ONLINE) return 0; - ForkThread(&TwitterProto::AddToListWorker, mir_utf8encodeT(result->nick)); - return AddToClientList(_T2A(result->nick), ""); + ForkThread(&TwitterProto::AddToListWorker, mir_utf8encodeT(psr->nick.t)); + return AddToClientList(_T2A(psr->nick.t), ""); } // ************************* @@ -124,14 +124,14 @@ void TwitterProto::DoSearch(void *p) if (found) { PROTOSEARCHRESULT psr = { sizeof(psr) }; psr.flags = PSR_TCHAR; - psr.nick = mir_a2t(info.username.c_str()); - psr.firstName = mir_a2t(info.real_name.c_str()); + psr.nick.t = mir_a2t(info.username.c_str()); + psr.firstName.t = mir_a2t(info.real_name.c_str()); ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)1, (LPARAM)&psr); ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0); - mir_free(psr.nick); - mir_free(psr.firstName); + mir_free(psr.nick.t); + mir_free(psr.firstName.t); } else ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0); -- cgit v1.2.3