CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

2 files changed, 2 insertions, 4 deletions

diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index 3b0723658f..0b18e83ab5 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "stdafx.h"

 

-CLIST_INTERFACE *pcli;

 HINSTANCE hInst;

 

 #define MS_HISTORY_DELETEALLCONTACTHISTORY       "BasicHistory/DeleteAllContactHistory"

@@ -243,7 +242,6 @@ int ModulesLoaded(WPARAM, LPARAM)
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	pcli = Clist_GetInterface();

 

 	hTaskMainMenu = nullptr;

 	DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &g_hMainThread, 0, FALSE, DUPLICATE_SAME_ACCESS);

diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp
index 829d636c96..4906732d31 100644
--- a/plugins/BasicHistory/src/EventList.cpp
+++ b/plugins/BasicHistory/src/EventList.cpp
@@ -343,7 +343,7 @@ void HistoryEventList::InitNames()
 {

 	wchar_t str[200];

 	if (m_hContact) {

-		wcscpy_s(m_contactName, pcli->pfnGetContactDisplayName(m_hContact, 0));

+		wcscpy_s(m_contactName, Clist_GetContactDisplayName(m_hContact));

 		mir_snwprintf(str, TranslateT("History for %s"), m_contactName);

 	}

 	else {

@@ -389,7 +389,7 @@ void HistoryEventList::AddGroup(const EventIndex& ev)
 std::wstring HistoryEventList::GetContactName()

 {

 	if (m_hContact)

-		return pcli->pfnGetContactDisplayName(m_hContact, 0);

+		return Clist_GetContactDisplayName(m_hContact);

 

 	return TranslateT("System");

 }