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/SeenPlugin/src/history.cpp | 4 +---
 plugins/SeenPlugin/src/main.cpp    | 2 --
 plugins/SeenPlugin/src/missed.cpp  | 2 +-
 plugins/SeenPlugin/src/utils.cpp   | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'plugins/SeenPlugin/src')

diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp
index 176168dd61..fb0f4f4e12 100644
--- a/plugins/SeenPlugin/src/history.cpp
+++ b/plugins/SeenPlugin/src/history.cpp
@@ -174,9 +174,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwndDlg, UINT Message, WPARAM wparam, LPARA
 		TranslateDialogDefault(hwndDlg);
 		hContact = (MCONTACT)lparam;
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lparam);
-		mir_snwprintf(sztemp, L"%s: %s",
-			pcli->pfnGetContactDisplayName(hContact, 0),
-			TranslateT("last seen history"));
+		mir_snwprintf(sztemp, L"%s: %s", Clist_GetContactDisplayName(hContact), TranslateT("last seen history"));
 		SetWindowText(hwndDlg, sztemp);
 		Window_SetSkinIcon_IcoLib(hwndDlg, SKINICON_OTHER_MIRANDA);
 
diff --git a/plugins/SeenPlugin/src/main.cpp b/plugins/SeenPlugin/src/main.cpp
index b52d98e957..7491080adf 100644
--- a/plugins/SeenPlugin/src/main.cpp
+++ b/plugins/SeenPlugin/src/main.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-CLIST_INTERFACE *pcli;
 HINSTANCE hInstance;
 HANDLE ehmissed = nullptr, ehuserinfo = nullptr, ehmissed_proto = nullptr;
 HANDLE g_hShutdownEvent;
@@ -85,7 +84,6 @@ static int OnShutdown(WPARAM, LPARAM)
 extern "C" __declspec(dllexport) int Load(void)
 {
 	mir_getLP(&pluginInfo);
-	pcli = Clist_GetInterface();
 
 	g_pUserInfo = WindowList_Create();
 	g_hShutdownEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
diff --git a/plugins/SeenPlugin/src/missed.cpp b/plugins/SeenPlugin/src/missed.cpp
index c24473164e..b378609f44 100644
--- a/plugins/SeenPlugin/src/missed.cpp
+++ b/plugins/SeenPlugin/src/missed.cpp
@@ -107,7 +107,7 @@ int ShowMissed(void)
 
 	CMStringW buf;
 	for (int loop = 0; loop < mcs.count; loop++) {
-		buf.Append(pcli->pfnGetContactDisplayName(mcs.wpcontact[loop], 0));
+		buf.Append(Clist_GetContactDisplayName(mcs.wpcontact[loop]));
 		if (db_get_b(NULL, S_MOD, "MissedOnes_Count", 0))
 			buf.AppendFormat(L" [%i]", mcs.times[loop]);
 
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index d93f241b4d..363da08e53 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -261,7 +261,7 @@ wchar_t* ParseString(wchar_t *szstring, MCONTACT hcontact)
 			goto LBL_2DigNum;
 
 		case 'n':
-			charPtr = hcontact ? (wchar_t*)pcli->pfnGetContactDisplayName(hcontact, 0) : (wantempty ? L"" : L"---");
+			charPtr = hcontact ? Clist_GetContactDisplayName(hcontact) : (wantempty ? L"" : L"---");
 			goto LBL_charPtr;
 
 		case 'N':
-- 
cgit v1.2.3