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/YARelay/src/main.cpp | 4 +--- plugins/YARelay/src/options.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins/YARelay/src') diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp index 4bea49cf35..d0feea1c5f 100644 --- a/plugins/YARelay/src/main.cpp +++ b/plugins/YARelay/src/main.cpp @@ -21,7 +21,6 @@ Features: #include "../../utils/mir_buffer.h" -CLIST_INTERFACE *pcli; HINSTANCE hInst; int hLangpack; @@ -144,7 +143,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDBEvent) switch(*++p) { case 'u': case 'U': - szUtfMsg.append(T2Utf(pcli->pfnGetContactDisplayName(hContact, 0))); + szUtfMsg.append(T2Utf(Clist_GetContactDisplayName(hContact))); break; case 'i': @@ -221,7 +220,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load() { mir_getLP(&pluginInfoEx); - pcli = Clist_GetInterface(); // Load plugin options from DB hForwardFrom = (MCONTACT)db_get_dw(NULL, "yaRelay", "ForwardFrom", 0); diff --git a/plugins/YARelay/src/options.cpp b/plugins/YARelay/src/options.cpp index 8a2fba246b..86d9ad6028 100644 --- a/plugins/YARelay/src/options.cpp +++ b/plugins/YARelay/src/options.cpp @@ -68,7 +68,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, SendDlgItemMessage(hwndDlg, IDC_COMBO_TO, CB_SETCURSEL, (WPARAM)idx, 0); for (auto &hContact : Contacts()) { - wchar_t *ptszNick = pcli->pfnGetContactDisplayName(hContact, 0); + wchar_t *ptszNick = Clist_GetContactDisplayName(hContact); if (ptszNick){ idx = SendDlgItemMessage(hwndDlg, IDC_COMBO_TO, CB_ADDSTRING, 0, (LPARAM)ptszNick); SendDlgItemMessage(hwndDlg, IDC_COMBO_TO, CB_SETITEMDATA, (WPARAM)idx, hContact); -- cgit v1.2.3