From 35e2289786a7f1542573d1a58ebc971970ea981c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 5 Apr 2018 22:10:25 +0300 Subject: CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName --- plugins/MirOTR/src/dllmain.cpp | 2 -- plugins/MirOTR/src/utils.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins/MirOTR/src') diff --git a/plugins/MirOTR/src/dllmain.cpp b/plugins/MirOTR/src/dllmain.cpp index f3bc0c756c..16ff5afaa8 100644 --- a/plugins/MirOTR/src/dllmain.cpp +++ b/plugins/MirOTR/src/dllmain.cpp @@ -1,7 +1,6 @@ // dllmain.cpp : Definiert den Einstiegspunkt für die DLL-Anwendung. #include "stdafx.h" -CLIST_INTERFACE *pcli; HANDLE hEventWindow; HINSTANCE hInst; @@ -60,7 +59,6 @@ extern "C" __declspec(dllexport) int Load(void) DEBUGOUTA("LOAD MIROTR"); mir_getLP(&pluginInfo); - pcli = Clist_GetInterface(); InitIcons(); diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp index acad664c75..a89ef8121f 100644 --- a/plugins/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/src/utils.cpp @@ -94,13 +94,13 @@ char* contact_get_id(MCONTACT hContact, bool bNameOnError) { ptrW pszUniqueID(Contact_GetInfo(CNF_UNIQUEID, hContact)); if (!pszUniqueID && bNameOnError) - pszUniqueID = mir_wstrdup(pcli->pfnGetContactDisplayName(hContact, 0)); + pszUniqueID = mir_wstrdup(Clist_GetContactDisplayName(hContact)); return mir_u2a(pszUniqueID); } __inline const wchar_t* contact_get_nameT(MCONTACT hContact) { - return pcli->pfnGetContactDisplayName(hContact, 0); + return Clist_GetContactDisplayName(hContact); } wchar_t* ProtoGetNickname(const char* proto) -- cgit v1.2.3