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/NewAwaySysMod/src/AwaySys.cpp     | 6 ++----
 plugins/NewAwaySysMod/src/ContactList.cpp | 2 +-
 plugins/NewAwaySysMod/src/ReadAwayMsg.cpp | 2 +-
 plugins/NewAwaySysMod/src/SetAwayMsg.cpp  | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'plugins/NewAwaySysMod')

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index c7b3d346b8..a88cec226b 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -42,7 +42,6 @@
 #include "version.h"
 
 HINSTANCE g_hInstance;
-CLIST_INTERFACE *pcli;
 
 int hLangpack;
 HANDLE g_hTopToolbarbutton;
@@ -319,7 +318,7 @@ int PreBuildContactMenu(WPARAM hContact, LPARAM)
 		// the protocol supports status message sending for current status, or autoreplying
 		if ((Flag1 & PF1_MODEMSGSEND && CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(iMode)) || 
 			((Flag1 & PF1_IM) == PF1_IM && (i < 0 || !g_AutoreplyOptPage.GetDBValueCopy(StatusModeList[i].DisableReplyCtlID))))
-			mir_snwprintf(szSetStr, TranslateT("Set %s message for the contact"), Clist_GetStatusModeDescription(iMode, 0), pcli->pfnGetContactDisplayName(hContact, 0));
+			mir_snwprintf(szSetStr, TranslateT("Set %s message for the contact"), Clist_GetStatusModeDescription(iMode, 0), Clist_GetContactDisplayName(hContact));
 
 		// the protocol supports status message reading for contact's status
 		if (Flag1 & PF1_MODEMSGRECV && CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(iContactMode)) {
@@ -498,7 +497,7 @@ INT_PTR srvVariablesHandler(WPARAM, LPARAM lParam)
 			Result = db_get_s(NULL, VarParseData.szProto, "Nick", (wchar_t*)nullptr);
 
 		if (Result == nullptr)
-			Result = pcli->pfnGetContactDisplayName(NULL, 0);
+			Result = Clist_GetContactDisplayName(0);
 
 		if (Result == nullptr)
 			Result = TranslateT("Stranger");
@@ -708,7 +707,6 @@ int MirandaLoaded(WPARAM, LPARAM)
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
-	pcli = Clist_GetInterface();
 
 	HookEvent(ME_SYSTEM_MODULESLOADED, MirandaLoaded);
 
diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp
index a5330645b9..a473696887 100644
--- a/plugins/NewAwaySysMod/src/ContactList.cpp
+++ b/plugins/NewAwaySysMod/src/ContactList.cpp
@@ -368,7 +368,7 @@ HTREEITEM CCList::AddContact(MCONTACT hContact)
 	TVINSERTSTRUCT tvIns;
 	memset(&tvIns, 0, sizeof(tvIns));
 	tvIns.hParent = AddGroup(db_get_s(hContact, "CList", "Group", L""));
-	tvIns.item.pszText = pcli->pfnGetContactDisplayName(hContact, 0);
+	tvIns.item.pszText = Clist_GetContactDisplayName(hContact);
 	tvIns.hInsertAfter = TVI_ROOT;
 	tvIns.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM;
 	tvIns.item.iImage = tvIns.item.iSelectedImage = Clist_GetContactIcon(hContact);
diff --git a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
index 79e477625a..c65196fc67 100644
--- a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
@@ -63,7 +63,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 			WindowList_Add(g_hReadWndList, hwndDlg, awayData->hContact);
 
 			wchar_t str[256], format[128];
-			wchar_t *contactName = pcli->pfnGetContactDisplayName(awayData->hContact, 0);
+			wchar_t *contactName = Clist_GetContactDisplayName(awayData->hContact);
 			char *szProto = GetContactProto(awayData->hContact);
 			wchar_t *status = Clist_GetStatusModeDescription(db_get_w(awayData->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);
 			GetWindowText(hwndDlg, format, _countof(format));
diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index 62c7243fdb..1d9f70b544 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -789,7 +789,7 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 								WindowTitle += L" ";
 							}
 
-							WindowTitle += pcli->pfnGetContactDisplayName(hContact, 0);
+							WindowTitle += Clist_GetContactDisplayName(hContact);
 							if (!IsAnICQProto(GetContactProto(hContact))) {
 								WindowTitle += L" ";
 								WindowTitle += TranslateT("available autoreply only");
-- 
cgit v1.2.3