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/Scriver/src/infobar.cpp     | 2 +-
 plugins/Scriver/src/msgdialog.cpp   | 6 +++---
 plugins/Scriver/src/msglog.cpp      | 2 +-
 plugins/Scriver/src/msgs.cpp        | 6 +++---
 plugins/Scriver/src/msgtimedout.cpp | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/Scriver')

diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp
index 3a38cc1f97..1bb6d077c0 100644
--- a/plugins/Scriver/src/infobar.cpp
+++ b/plugins/Scriver/src/infobar.cpp
@@ -88,7 +88,7 @@ void CSrmmWindow::RefreshInfobar()
 		wcsncpy_s(szText, TranslateW(szXStatusName), _TRUNCATE);
 	st.flags = ST_DEFAULT;
 	st.codepage = 1200;
-	SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_NAME, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)pcli->pfnGetContactDisplayName(m_hContact, 0));
+	SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_NAME, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)Clist_GetContactDisplayName(m_hContact));
 	SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_STATUS, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)szContactStatusMsg);
 	hIcon = (HICON)SendDlgItemMessage(m_hwndInfo, IDC_XSTATUSICON, STM_SETICON, (WPARAM)hIcon, 0);
 	if (hIcon)
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index a2562174cb..9df51fc70c 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -728,7 +728,7 @@ void CSrmmWindow::UpdateStatusBar()
 		else if (m_nTypeSecs) {
 			sbd.hIcon = GetCachedIcon("scriver_TYPING");
 			sbd.pszText = szText;
-			mir_snwprintf(szText, TranslateT("%s is typing a message..."), pcli->pfnGetContactDisplayName(m_hContact, 0));
+			mir_snwprintf(szText, TranslateT("%s is typing a message..."), Clist_GetContactDisplayName(m_hContact));
 			m_nTypeSecs--;
 		}
 		else if (m_lastMessage) {
@@ -790,7 +790,7 @@ void CSrmmWindow::UpdateTitle()
 		wszTitle = L"%name% (%status%) : ";
 
 	if (m_hContact && m_szProto) {
-		wszTitle.Replace(L"%name%", pcli->pfnGetContactDisplayName(m_hContact, 0));
+		wszTitle.Replace(L"%name%", Clist_GetContactDisplayName(m_hContact));
 		wszTitle.Replace(L"%status%", Clist_GetStatusModeDescription(db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE), 0));
 
 		CMStringW tszStatus = ptrW(db_get_wsa(m_hContact, "CList", "StatusMsg"));
@@ -1160,7 +1160,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 		TabControlData tcd;
 		tcd.iFlags = TCDF_TEXT | TCDF_ICON;
 		tcd.hIcon = GetTabIcon();
-		tcd.pszText = pcli->pfnGetContactDisplayName(m_hContact, 0);
+		tcd.pszText = Clist_GetContactDisplayName(m_hContact);
 		SendMessage(m_hwndParent, CM_UPDATETABCONTROL, (WPARAM)&tcd, (LPARAM)m_hwnd);
 		break;
 
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 912b5a4741..74c7d1330c 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -145,7 +145,7 @@ EventData* getEventFromDB(CSrmmWindow *dat, MCONTACT hContact, MEVENT hDbEvent)
 	if (evt->dwFlags & IEEDF_SENT)
 		evt->pszNickT = Contact_GetInfo(CNF_DISPLAY, 0, dat->m_szProto);
 	else
-		evt->pszNickT = mir_wstrdup(pcli->pfnGetContactDisplayName(hContact, 0));
+		evt->pszNickT = mir_wstrdup(Clist_GetContactDisplayName(hContact));
 
 	if (evt->eventType == EVENTTYPE_FILE) {
 		char *filename = ((char*)dbei.pBlob) + sizeof(DWORD);
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 3af9114bac..6bf42b4f49 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -114,7 +114,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	}
 	if (hwnd == nullptr || !IsWindowVisible(GetParent(hwnd))) {
 		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.flags = CLEF_UNICODE;
@@ -195,7 +195,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 		SendMessage(hwnd, DM_TYPING, 0, lParam);
 	else if (lParam && (g_dat.flags2 & SMF2_SHOWTYPINGTRAY)) {
 		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.flags2 & SMF2_SHOWTYPINGCLIST) {
 			pcli->pfnRemoveEvent(hContact, 1);
 
@@ -277,7 +277,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/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp
index e9fb7d7435..4fe279e9af 100644
--- a/plugins/Scriver/src/msgtimedout.cpp
+++ b/plugins/Scriver/src/msgtimedout.cpp
@@ -33,7 +33,7 @@ CErrorDlg::CErrorDlg(const wchar_t *pwszDescr, HWND hWnd, MessageSendQueueItem *
 	m_btnOk(this, IDOK),
 	m_btnCancel(this, IDCANCEL)
 {
-	const wchar_t *pwszName = pcli->pfnGetContactDisplayName(pItem->hContact, 0);
+	const wchar_t *pwszName = Clist_GetContactDisplayName(pItem->hContact);
 	if (pwszName)
 		m_wszName.Format(L"%s - %s", TranslateT("Send error"), pwszName);
 	else
-- 
cgit v1.2.3