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

---
 plugins/ContactsPlus/src/main.cpp  | 2 +-
 plugins/ContactsPlus/src/send.cpp  | 2 +-
 plugins/ContactsPlus/src/utils.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/ContactsPlus')

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index e536d8ef43..16bfe8a35f 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -73,7 +73,7 @@ static int HookDBEventAdded(WPARAM hContact, LPARAM hDbEvent)
 	{
 		//add event to the contact list
 		wchar_t caToolTip[128];
-		mir_snwprintf(caToolTip, L"%s %s", TranslateT("Contacts received from"), pcli->pfnGetContactDisplayName(hContact, 0));
+		mir_snwprintf(caToolTip, L"%s %s", TranslateT("Contacts received from"), Clist_GetContactDisplayName(hContact));
 
 		CLISTEVENT cle = {};
 		cle.hContact = hContact;
diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index 6176597a39..430bbe36b3 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -411,7 +411,7 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			int i;
 			for (i = 0; i < ackData->nContacts; i++) {
 				// prepare data & count size
-				maSend[i].mcaNick = mir_utf8encodeW(pcli->pfnGetContactDisplayName(ackData->aContacts[i], 0));
+				maSend[i].mcaNick = mir_utf8encodeW(Clist_GetContactDisplayName(ackData->aContacts[i]));
 				maSend[i].mcaUIN = mir_utf8encodeW(ptrW(GetContactUID(ackData->aContacts[i])));
 				dbei.cbBlob += (DWORD)strlennull(maSend[i].mcaUIN) + (DWORD)strlennull((char*)maSend[i].mcaNick) + 2;
 			}
diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index ac3b711eec..a3dd0e8a84 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -112,7 +112,7 @@ void UpdateDialogTitle(HWND hwndDlg, MCONTACT hContact, wchar_t *pszTitleStart)
 		char *szProto = GetContactProto(hContact);
 		if (szProto) {
 			ptrW uid(GetContactUID(hContact));
-			wchar_t *contactName = pcli->pfnGetContactDisplayName(hContact, 0);
+			wchar_t *contactName = Clist_GetContactDisplayName(hContact);
 
 			wchar_t oldTitle[MAX_PATH];
 			GetDlgItemText(hwndDlg, IDC_NAME, oldTitle, _countof(oldTitle));
-- 
cgit v1.2.3