diff options
author | George Hazan <ghazan@miranda.im> | 2018-04-05 22:10:25 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-04-05 22:10:25 +0300 |
commit | 35e2289786a7f1542573d1a58ebc971970ea981c (patch) | |
tree | da8887c793611fdbf6072fd477fd8c01c60b8b02 /plugins/YARelay | |
parent | f7c00d6dc53774d16b9721e79ed5d4017af63884 (diff) |
CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName
Diffstat (limited to 'plugins/YARelay')
-rw-r--r-- | plugins/YARelay/src/main.cpp | 4 | ||||
-rw-r--r-- | plugins/YARelay/src/options.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
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);
|