CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

2 files changed, 1 insertions, 3 deletions

diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp
index a805dc8521..0a628931f2 100644
--- a/plugins/Spamotron/src/spamotron.cpp
+++ b/plugins/Spamotron/src/spamotron.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"

 

-CLIST_INTERFACE *pcli;

 HINSTANCE hInst;

 HANDLE hOptInitialize, hModulesLoaded, hDBContactAdded, hDBEventAdded, hDBEventFilterAdd;

 time_t last_queue_check = 0;

@@ -507,7 +506,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 extern "C" __declspec(dllexport) int Load()

 {

 	mir_getLP(&pluginInfo);

-	pcli = Clist_GetInterface();

 

 	srand((unsigned)time(nullptr));

 	bayesdb = nullptr;

diff --git a/plugins/Spamotron/src/utils.cpp b/plugins/Spamotron/src/utils.cpp
index 6084dc7a4d..be49f90879 100644
--- a/plugins/Spamotron/src/utils.cpp
+++ b/plugins/Spamotron/src/utils.cpp
@@ -427,7 +427,7 @@ int _notify(MCONTACT hContact, BYTE type, wchar_t *message, wchar_t *origmessage
 {
 	char *tmp, *tmporig;
 	wchar_t msg[MAX_BUFFER_LENGTH];
-	mir_snwprintf(msg, message, pcli->pfnGetContactDisplayName(hContact, 0));
+	mir_snwprintf(msg, message, Clist_GetContactDisplayName(hContact));
 
 	if (_getOptB("LogActions", defaultLogActions)) {
 		tmp = mir_u2a(msg);