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

---
 src/core/stdmsg/src/msgdialog.cpp | 4 ++--
 src/core/stdmsg/src/msglog.cpp    | 4 ++--
 src/core/stdmsg/src/msgs.cpp      | 6 +++---
 src/core/stdmsg/src/tabs.cpp      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 9706b8a49f..ed1e9e0f2f 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1020,7 +1020,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		wchar_t newtitle[256];
 		if (m_hContact && m_szProto) {
 			m_wStatus = db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE);
-			wchar_t *contactName = pcli->pfnGetContactDisplayName(m_hContact, 0);
+			wchar_t *contactName = Clist_GetContactDisplayName(m_hContact);
 
 			wchar_t *szStatus = Clist_GetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE), 0);
 			if (g_dat.bUseStatusWinIcon)
@@ -1221,7 +1221,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			else {
 				if (m_nTypeSecs) {
 					wchar_t szBuf[256];
-					wchar_t* szContactName = pcli->pfnGetContactDisplayName(m_hContact, 0);
+					wchar_t* szContactName = Clist_GetContactDisplayName(m_hContact);
 					HICON hTyping = Skin_LoadIcon(SKINICON_OTHER_TYPING);
 
 					mir_snwprintf(szBuf, TranslateT("%s is typing a message..."), szContactName);
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 58d6ecf2a7..dac3fdb793 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -274,7 +274,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat)
 			else
 				szName = TranslateT("Me");
 		}
-		else szName = pcli->pfnGetContactDisplayName(dat->hContact, 0);
+		else szName = Clist_GetContactDisplayName(dat->hContact);
 
 		SetToStyle((dbei.flags & DBEF_SENT) ? MSGFONTID_MYNAME : MSGFONTID_YOURNAME, buf);
 		AppendToBufferWithRTF(buf, szName);
@@ -295,7 +295,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat)
 			}
 			else szName = L"";
 		}
-		else szName = pcli->pfnGetContactDisplayName(dat->hContact, 0);
+		else szName = Clist_GetContactDisplayName(dat->hContact);
 
 		SetToStyle(MSGFONTID_NOTICE, buf);
 		AppendToBufferWithRTF(buf, szName);
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 60b5bbea0f..7c422a5d7b 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -92,7 +92,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	}
 
 	wchar_t toolTip[256];
-	mir_snwprintf(toolTip, TranslateT("Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
+	mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(hContact));
 
 	CLISTEVENT cle = {};
 	cle.hContact = hContact;
@@ -171,7 +171,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 		SendMessage(hwnd, DM_TYPING, 0, lParam);
 	else if (lParam && g_dat.bShowTypingTray) {
 		wchar_t szTip[256];
-		mir_snwprintf(szTip, TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName(hContact, 0));
+		mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));
 
 		if (g_dat.bShowTypingClist) {
 			pcli->pfnRemoveEvent(hContact, 1);
@@ -275,7 +275,7 @@ static void RestoreUnreadMessageAlerts(void)
 	cle.szTooltip.w = toolTip;
 
 	for (auto &e : arEvents) {
-		mir_snwprintf(toolTip, TranslateT("Message from %s"), pcli->pfnGetContactDisplayName(e->hContact, 0));
+		mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(e->hContact));
 		cle.hContact = e->hContact;
 		cle.hDbEvent = e->hEvent;
 		pcli->pfnAddEvent(&cle);
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 0e33116897..bde2ab32f8 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -140,7 +140,7 @@ CTabbedWindow* CTabbedWindow::AddPage(MCONTACT hContact, wchar_t *pwszText, int
 		pDlg->m_bNoActivate = iNoActivate != 0;
 
 	if (g_Settings.bTabsEnable) {
-		m_tab.AddPage(pcli->pfnGetContactDisplayName(hContact, 0), nullptr, pDlg);
+		m_tab.AddPage(Clist_GetContactDisplayName(hContact), nullptr, pDlg);
 		FixTabIcons(pDlg);
 
 		m_tab.ActivatePage(m_tab.GetCount() - 1);
-- 
cgit v1.2.3