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/SecureIM/src/crypt_lists.cpp  | 4 ++--
 plugins/SecureIM/src/crypt_popups.cpp | 2 +-
 plugins/SecureIM/src/main.cpp         | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'plugins/SecureIM/src')

diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp
index e927f7a853..34f9306fde 100644
--- a/plugins/SecureIM/src/crypt_lists.cpp
+++ b/plugins/SecureIM/src/crypt_lists.cpp
@@ -186,13 +186,13 @@ void addMsg2Queue(pUinKey ptr, WPARAM wParam, LPSTR szMsg)
 
 void getContactNameA(MCONTACT hContact, LPSTR szName)
 {
-	ptrA dn(mir_u2a((LPWSTR)pcli->pfnGetContactDisplayName(hContact, 0)));
+	ptrA dn(mir_u2a(Clist_GetContactDisplayName(hContact)));
 	mir_strcpy(szName, dn);
 }
 
 void getContactName(MCONTACT hContact, LPSTR szName)
 {
-	mir_wstrcpy((LPWSTR)szName, (LPWSTR)pcli->pfnGetContactDisplayName(hContact, 0));
+	mir_wstrcpy((LPWSTR)szName, Clist_GetContactDisplayName(hContact));
 }
 
 void getContactUinA(MCONTACT hContact, LPSTR szUIN)
diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp
index fbced3dd22..c57827c6c7 100644
--- a/plugins/SecureIM/src/crypt_popups.cpp
+++ b/plugins/SecureIM/src/crypt_popups.cpp
@@ -41,7 +41,7 @@ void showPopup(LPCSTR lpzText, MCONTACT hContact, HICON hIcon, UINT type)
 	POPUPDATAW ppd = { 0 };
 	ppd.lchContact = hContact; //Be sure to use a GOOD handle, since this will not be checked.
 	ppd.lchIcon = hIcon;
-	LPWSTR lpwzContactName = (LPWSTR)pcli->pfnGetContactDisplayName(hContact, 0);
+	LPWSTR lpwzContactName = Clist_GetContactDisplayName(hContact);
 	wcsncpy(ppd.lpwzContactName, lpwzContactName, MAX_CONTACTNAME-1);
 	LPWSTR lpwzText = mir_a2u(lpzText);
 	wcsncpy(ppd.lpwzText, TranslateW(lpwzText),MAX_SECONDLINE-1);
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index d062711c6f..87a021d713 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -1,6 +1,5 @@
 #include "commonheaders.h"
 
-CLIST_INTERFACE *pcli;
 int hLangpack = 0;
 
 PLUGININFOEX pluginInfoEx = {
@@ -288,7 +287,6 @@ static int onShutdown(WPARAM, LPARAM)
 extern "C" __declspec(dllexport) int __cdecl Load(void)
 {
 	mir_getLP(&pluginInfoEx);
-	pcli = Clist_GetInterface();
 
 	DisableThreadLibraryCalls(g_hInst);
 
-- 
cgit v1.2.3