From 1a6ae4dcc2b3e20baf392127d590d02e855ba357 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 19:50:12 +0300 Subject: CLIST_INTERFACE::pfnNotifyNewContact => Clist_NotifyNewContact --- src/mir_app/src/clc.cpp | 6 +++--- src/mir_app/src/clc.h | 1 - src/mir_app/src/clcutils.cpp | 2 +- src/mir_app/src/clistcore.cpp | 1 - src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index c2b0efeadf..e3a10a32f8 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -424,7 +424,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam case INTM_CONTACTADDED: cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); - cli.pfnNotifyNewContact(hwnd, wParam); + Clist_NotifyNewContact(hwnd, wParam); SortClcByTimer(hwnd); break; @@ -442,7 +442,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam if (Clist_FindItem(hwnd, dat, wParam, nullptr, nullptr, nullptr)) break; cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); - cli.pfnNotifyNewContact(hwnd, wParam); + Clist_NotifyNewContact(hwnd, wParam); } else cli.pfnDeleteItemFromTree(hwnd, wParam); @@ -509,7 +509,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam Clist_FindItem(hwnd, dat, wParam, &contact, nullptr, nullptr); if (contact) { contact->iImage = (WORD)lParam; - cli.pfnNotifyNewContact(hwnd, wParam); + Clist_NotifyNewContact(hwnd, wParam); dat->bNeedsResort = true; } } diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index 46f95c5d5a..6da7cbae76 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -91,7 +91,6 @@ int fnGetDropTargetInformation(HWND hwnd, struct ClcData *dat, POINT pt); int fnClcStatusToPf2(int status); int fnIsHiddenMode(struct ClcData *dat, int status); void fnHideInfoTip(HWND hwnd, struct ClcData *dat); -void fnNotifyNewContact(HWND hwnd, MCONTACT hContact); void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour); void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst); void fnSetContactCheckboxes(ClcContact *cc, int checked); diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 1e41121b0e..fb21c93e7b 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -648,7 +648,7 @@ void fnHideInfoTip(HWND, ClcData *dat) NotifyEventHooks(hHideInfoTipEvent, 0, (LPARAM)&it); } -void fnNotifyNewContact(HWND hwnd, MCONTACT hContact) +MIR_APP_DLL(void) Clist_NotifyNewContact(HWND hwnd, MCONTACT hContact) { NMCLISTCONTROL nm; nm.hdr.code = CLN_NEWCONTACT; diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index ba3ebdbf46..28a1171b96 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -109,7 +109,6 @@ void InitClistCore() cli.pfnIsHiddenMode = fnIsHiddenMode; cli.pfnIsVisibleContact = fnIsVisibleContact; cli.pfnHideInfoTip = fnHideInfoTip; - cli.pfnNotifyNewContact = fnNotifyNewContact; cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting; cli.pfnLoadClcOptions = fnLoadClcOptions; cli.pfnGetRowBottomY = fnGetRowBottomY; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 7847920997..284713443f 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -562,3 +562,4 @@ Clist_SetGroupChildCheckboxes @581 Clist_RecalculateGroupCheckboxes @582 Clist_GetFontSetting @583 Clist_GetDefaultExStyle @584 +Clist_NotifyNewContact @585 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 33dfe19f1c..bb3890fc94 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -562,3 +562,4 @@ Clist_SetGroupChildCheckboxes @581 Clist_RecalculateGroupCheckboxes @582 Clist_GetFontSetting @583 Clist_GetDefaultExStyle @584 +Clist_NotifyNewContact @585 -- cgit v1.2.3