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/wbOSD/src/events.cpp | 8 ++++----
 plugins/wbOSD/src/main.cpp   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'plugins/wbOSD/src')

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index 4b5865db85..bda652b9ed 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -63,7 +63,7 @@ int ProtoAck(WPARAM,LPARAM lparam)
 			DWORD ann = db_get_dw( NULL, THIS_MODULE, "announce", DEFAULT_ANNOUNCE );
 			if ( ann & ( 1 << ( ack->lParam - ID_STATUS_OFFLINE ))) {
 				wchar_t buffer[512];
-				mir_snwprintf(buffer, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(ack->hContact, 0), Clist_GetStatusModeDescription(ack->lParam, 0));
+				mir_snwprintf(buffer, TranslateT("%s is %s"), Clist_GetContactDisplayName(ack->hContact), Clist_GetStatusModeDescription(ack->lParam, 0));
 				ShowOSD(buffer, 0, db_get_dw(NULL,THIS_MODULE, "clr_status", DEFAULT_CLRSTATUS), ack->hContact);
 	}	}	}
 
@@ -121,7 +121,7 @@ int ContactStatusChanged(WPARAM wParam, LPARAM lParam)
 		return 0;
 
 	wchar_t bufferW[512];
-	mir_snwprintf(bufferW, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(wParam, 0), Clist_GetStatusModeDescription(newStatus, 0));
+	mir_snwprintf(bufferW, TranslateT("%s is %s"), Clist_GetContactDisplayName(wParam), Clist_GetStatusModeDescription(newStatus, 0));
 	ShowOSD(bufferW, 0, db_get_dw(NULL,THIS_MODULE, "clr_status", DEFAULT_CLRSTATUS), hContact);
 	return 0;
 }
@@ -182,12 +182,12 @@ int HookedNewEvent(WPARAM wParam, LPARAM hDBEvent)
 
 	wchar_t *c1 = nullptr, *c2 = nullptr;
 	if ( i1 == 1 )
-		c1 = mir_wstrdup(pcli->pfnGetContactDisplayName(wParam, 0));
+		c1 = mir_wstrdup(Clist_GetContactDisplayName(wParam));
 	else if ( i1 == 2 )
 		c1 = DbEvent_GetTextW( &dbe, 0 );
 
 	if ( i2 == 1 )
-		c2 = mir_wstrdup(pcli->pfnGetContactDisplayName(wParam, 0));
+		c2 = mir_wstrdup(Clist_GetContactDisplayName(wParam));
 	else if ( i2 == 2 )
 		c2 = DbEvent_GetTextW( &dbe, 0 );
 
diff --git a/plugins/wbOSD/src/main.cpp b/plugins/wbOSD/src/main.cpp
index a898fcd591..fdae90110a 100644
--- a/plugins/wbOSD/src/main.cpp
+++ b/plugins/wbOSD/src/main.cpp
@@ -13,7 +13,6 @@ HINSTANCE hI;
 
 HWND g_hWnd = nullptr;
 int hLangpack = 0;
-CLIST_INTERFACE *pcli;
 HANDLE hHookedInit, hProtoAck, hContactSettingChanged, hHookContactStatusChanged, hContactStatusChanged;
 
 void logmsg2(char *str);
@@ -44,7 +43,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)
 extern "C" __declspec(dllexport) int Load()
 {
 	mir_getLP(&pluginInfo);
-	pcli = Clist_GetInterface();
 
 	logmsg("Load");
 	hHookedInit = HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);
-- 
cgit v1.2.3