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/MRA/src/MraProto.cpp | 2 +- protocols/MRA/src/Mra_proto.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/MRA') diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index ec6f7f229f..74d587d25a 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -156,7 +156,7 @@ MCONTACT CMraProto::AddToList(int flags, PROTOSEARCHRESULT *psr) if (psr->cbSize != sizeof(PROTOSEARCHRESULT)) return 0; - return AddToListByEmail(psr->email, psr->nick, psr->firstName, psr->lastName, flags); + return AddToListByEmail(psr->email.t, psr->nick.t, psr->firstName.t, psr->lastName.t, flags); } MCONTACT CMraProto::AddToListByEvent(int, int, MEVENT hDbEvent) diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index 80eed2e2a7..f1060c459e 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -943,11 +943,11 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf) psr.cbSize = sizeof(psr); psr.flags = PSR_UNICODE; - psr.nick = szNick; - psr.firstName = szFirstName; - psr.lastName = szLastName; - psr.email = szEmail; - psr.id = szEmail; + psr.nick.t = szNick; + psr.firstName.t = szFirstName; + psr.lastName.t = szLastName; + psr.email.t = szEmail; + psr.id.t = szEmail; for (DWORD i = 0; i < dwFieldsNum; i++) { CMStringA &fld = pmralpsFields[i]; -- cgit v1.2.3