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/SimpleStatusMsg/src/awaymsg.cpp | 4 ++-- plugins/SimpleStatusMsg/src/main.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins/SimpleStatusMsg') diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index fa69450ce4..ab62e4bd34 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -80,7 +80,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP WindowList_Add(hWindowList, hwndDlg, dat->hContact); { wchar_t str[256], format[128]; - wchar_t *contactName = (wchar_t *)pcli->pfnGetContactDisplayName(dat->hContact, 0); + wchar_t *contactName = Clist_GetContactDisplayName(dat->hContact, 0); char *szProto = GetContactProto(dat->hContact); WORD dwStatus = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_OFFLINE); wchar_t *status = Clist_GetStatusModeDescription(dwStatus, 0); @@ -202,7 +202,7 @@ static INT_PTR CALLBACK CopyAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP dat->hSeq = (HANDLE)ProtoChainSend(dat->hContact, PSS_GETAWAYMSG, 0, 0); dat->hAwayMsgEvent = dat->hSeq ? HookEventMessage(ME_PROTO_ACK, hwndDlg, HM_AWAYMSG) : nullptr; WindowList_Add(hWindowList2, hwndDlg, dat->hContact); - wchar_t *contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0); + wchar_t *contactName = Clist_GetContactDisplayName(dat->hContact); wchar_t str[256], format[128]; GetWindowText(hwndDlg, format, _countof(format)); mir_snwprintf(str, format, contactName); diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index 38a0c8e997..a450a61e73 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc., HINSTANCE g_hInst; int hLangpack; -CLIST_INTERFACE *pcli; PROTOACCOUNTS *accounts; static int g_iIdleTime = -1; @@ -1805,7 +1804,6 @@ static INT_PTR sttGetAwayMessageT(WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void) { mir_getLP(&pluginInfo); - pcli = Clist_GetInterface(); hwndSAMsgDialog = nullptr; accounts = (PROTOACCOUNTS *)mir_alloc(sizeof(PROTOACCOUNTS)); -- cgit v1.2.3