From 35e2289786a7f1542573d1a58ebc971970ea981c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 5 Apr 2018 22:10:25 +0300 Subject: CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName --- protocols/MRA/src/Mra_proto.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/MRA/src/Mra_proto.cpp') diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index aa1048ddf4..0c057efd27 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -699,7 +699,7 @@ bool CMraProto::CmdUserStatus(BinBuffer &buf) if (dwTemp == ID_STATUS_OFFLINE) { // was/now invisible CMStringW wszEmail, wszBuff; mraGetStringW(hContact, "e-mail", wszEmail); - wszBuff.Format(L"%s <%s> - %s", pcli->pfnGetContactDisplayName(hContact, 0), wszEmail.c_str(), TranslateT("invisible status changed")); + wszBuff.Format(L"%s <%s> - %s", Clist_GetContactDisplayName(hContact), wszEmail.c_str(), TranslateT("invisible status changed")); MraPopupShowFromContactW(hContact, MRA_POPUP_TYPE_INFORMATION, wszBuff); MraSetContactStatus(hContact, ID_STATUS_INVISIBLE); @@ -1266,7 +1266,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf) SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, (SCBIF_ID | SCBIF_GROUP_ID | SCBIF_SERVER_FLAG | SCBIF_STATUS), dwID, dwGroupID, dwContactFlag, dwContactSeverFlags, dwTemp, nullptr, &wszNick, &szCustomPhones); if (wszNick.IsEmpty()) { // set the server-side nick - wszNick = pcli->pfnGetContactDisplayName(hContact, 0); + wszNick = Clist_GetContactDisplayName(hContact); MraModifyContact(hContact, &dwID, &dwContactFlag, &dwGroupID, &szEmail, &wszNick, &szCustomPhones); } } @@ -1317,7 +1317,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf) SetExtraIcons(hContact); MraSetContactStatus(hContact, ID_STATUS_ONLINE); - CMStringW wszCustomName = pcli->pfnGetContactDisplayName(hContact, 0); + CMStringW wszCustomName = Clist_GetContactDisplayName(hContact); MraAddContact(hContact, (CONTACT_FLAG_VISIBLE | CONTACT_FLAG_MULTICHAT), -1, email, wszCustomName); } else { -- cgit v1.2.3