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/TipperYM/src/popwin.cpp | 4 ++--
 plugins/TipperYM/src/subst.cpp  | 2 +-
 plugins/TipperYM/src/tipper.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/TipperYM/src')

diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index c6f520c024..efd68d09c7 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -304,7 +304,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 				if (!opt.bWaitForContent)
 					db_unset(pwd->hContact, MODULE, "TempStatusMsg");
 
-				wcsncpy_s(pwd->swzTitle, pcli->pfnGetContactDisplayName(pwd->hContact, 0), _TRUNCATE);
+				wcsncpy_s(pwd->swzTitle, Clist_GetContactDisplayName(pwd->hContact), _TRUNCATE);
 
 				char *szProto = GetContactProto(pwd->hContact);
 				pwd->spiTitle = Smileys_PreParse(pwd->swzTitle, -1, szProto);
@@ -1607,7 +1607,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 								bTitlePainted = true;
 							}
 
-							wchar_t *swzNick = (wchar_t *)pcli->pfnGetContactDisplayName(hContact, 0);
+							wchar_t *swzNick = Clist_GetContactDisplayName(hContact);
 							if (opt.iFavoriteContFlags & FAVCONT_APPEND_PROTO) {
 								wchar_t *swzProto = a2t(proto);
 								mir_snwprintf(swzName, L"%s (%s)", swzNick, swzProto);
diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index e50a1c808a..95c0051e77 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -305,7 +305,7 @@ bool GetSysSubstText(MCONTACT hContact, wchar_t *swzRawSpec, wchar_t *buff, int
 		if (!hSubContact)
 			return false;
 		
-		wchar_t *swzNick = pcli->pfnGetContactDisplayName(hSubContact, 0);
+		wchar_t *swzNick = Clist_GetContactDisplayName(hSubContact);
 		if (swzNick)
 			wcsncpy(buff, swzNick, bufflen);
 		return true;
diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp
index 149f721a9e..5a8d31192f 100644
--- a/plugins/TipperYM/src/tipper.cpp
+++ b/plugins/TipperYM/src/tipper.cpp
@@ -34,7 +34,7 @@ HANDLE hReloadFonts = nullptr;
 HANDLE hFolderChanged, hSkinFolder;
 wchar_t SKIN_FOLDER[256];
 
-CLIST_INTERFACE *pcli = nullptr;
+CLIST_INTERFACE *pcli;
 int hLangpack;
 
 PLUGININFOEX pluginInfoEx =
-- 
cgit v1.2.3