From 35e2289786a7f1542573d1a58ebc971970ea981c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 5 Apr 2018 22:10:25 +0300
Subject: CLIST_INTERFACE::pfnGetContactDisplayName =>
 Clist_GetContactDisplayName

---
 protocols/JabberG/src/jabber_chat.cpp    | 2 +-
 protocols/JabberG/src/jabber_events.cpp  | 2 +-
 protocols/JabberG/src/jabber_menu.cpp    | 2 +-
 protocols/JabberG/src/jabber_privacy.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'protocols/JabberG/src')

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 41f505a4ce..50cfa1acae 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1282,7 +1282,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 			if (item != nullptr) {
 				item->type = L"conference";
 				MCONTACT hContact = ppro->HContactFromJID(item->jid);
-				item->name = pcli->pfnGetContactDisplayName(hContact, 0);
+				item->name = Clist_GetContactDisplayName(hContact);
 				ppro->AddEditBookmark(item);
 			}
 		}
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index ec31312ec5..866e09447d 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -112,7 +112,7 @@ void __cdecl CJabberProto::OnRenameContact(DBCONTACTWRITESETTING *cws, MCONTACT
 		return;
 
 	if (cws->value.type == DBVT_DELETED) {
-		wchar_t *nick = pcli->pfnGetContactDisplayName(hContact, GCDNF_NOMYHANDLE);
+		wchar_t *nick = Clist_GetContactDisplayName(hContact, GCDNF_NOMYHANDLE);
 		AddContactToRoster(item->jid, nick, item->group);
 		mir_free(nick);
 		return;
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 240330daec..a18c7f1152 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -516,7 +516,7 @@ INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM hContact, LPARAM)
 	if (ListGetItemPtr(LIST_BOOKMARK, roomID) == nullptr) {
 		JABBER_LIST_ITEM *item = new JABBER_LIST_ITEM();
 		item->jid = mir_wstrdup(roomID);
-		item->name = pcli->pfnGetContactDisplayName(hContact, 0);
+		item->name = Clist_GetContactDisplayName(hContact);
 		item->type = L"conference";
 		item->nick = getWStringA(hContact, "MyNick");
 		AddEditBookmark(item);
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 88304d7830..4496d76659 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -1158,7 +1158,7 @@ void CJabberDlgPrivacyLists::DrawRulesList(LPDRAWITEMSTRUCT lpdis)
 				DrawNextRulePart(lpdis->hDC, clLine2, TranslateT("'"), &rc);
 
 				if (MCONTACT hContact = m_proto->HContactFromJID(pRule->GetValue())) {
-					wchar_t *szName = pcli->pfnGetContactDisplayName(hContact, 0);
+					wchar_t *szName = Clist_GetContactDisplayName(hContact);
 					if (szName) {
 						DrawNextRulePart(lpdis->hDC, clLine2, TranslateT(" (nickname: "), &rc);
 						DrawNextRulePart(lpdis->hDC, clLine1, szName, &rc);
-- 
cgit v1.2.3