From d4b6de0fb4ca58063eb2f424c77e74e703022b63 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 4 Apr 2018 21:07:46 +0300
Subject: static function CLIST_INTERFACE::pfnGetContactIcon exported as
 Clist_GetContactIcon (history++ to be recompiled)

---
 plugins/Clist_nicer/src/clc.cpp         | 4 ++--
 plugins/Clist_nicer/src/clcitems.cpp    | 4 ++--
 plugins/Clist_nicer/src/clcpaint.cpp    | 4 ++--
 plugins/Clist_nicer/src/clistevents.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/Clist_nicer')

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index d1c94a1ff9..c56b4265d7 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -320,7 +320,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 
 			int shouldShow = (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN ||
 				!CLVM_GetContactHiddenStatus(hContact, szProto, dat)) && ((cfg::dat.bFilterEffective ? TRUE : !pcli->pfnIsHiddenMode(dat, status)) ||
-				pcli->pfnGetContactIcon(hContact) != lParam); // XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown
+				Clist_GetContactIcon(hContact) != lParam); // XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown
 
 			if (!Clist_FindItem(hwnd, dat, hContact, &contact, &group, nullptr)) {
 				if (shouldShow && db_is_contact(wParam)) {
@@ -377,7 +377,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		if (contact->bIsMeta && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
 			contact->hSubContact = db_mc_getMostOnline(contact->hContact);
 			contact->metaProto = GetContactProto(contact->hSubContact);
-			contact->iImage = pcli->pfnGetContactIcon(contact->hSubContact);
+			contact->iImage = Clist_GetContactIcon(contact->hSubContact);
 			if (contact->pExtra) {
 				TExtraCache *pSub = cfg::getCache(contact->hSubContact, contact->metaProto);
 				ClcContact *subContact;
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index a85e549302..45eb501421 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -108,10 +108,10 @@ ClcContact* AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hCo
 	if (p->bIsMeta && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
 		p->hSubContact = db_mc_getMostOnline(hContact);
 		p->metaProto = GetContactProto(p->hSubContact);
-		p->iImage = pcli->pfnGetContactIcon(p->hSubContact);
+		p->iImage = Clist_GetContactIcon(p->hSubContact);
 	}
 	else {
-		p->iImage = pcli->pfnGetContactIcon(hContact);
+		p->iImage = Clist_GetContactIcon(hContact);
 		p->metaProto = nullptr;
 	}
 
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 2aceaab9ee..88dbc9f368 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -201,7 +201,7 @@ void PaintNotifyArea(HDC hDC, RECT *rc)
 	int iCount = GetMenuItemCount(cfg::dat.hMenuNotify);
 	if (cfg::dat.hUpdateContact != 0) {
 		wchar_t *szName = pcli->pfnGetContactDisplayName(cfg::dat.hUpdateContact, 0);
-		int iIcon = pcli->pfnGetContactIcon(cfg::dat.hUpdateContact);
+		int iIcon = Clist_GetContactIcon(cfg::dat.hUpdateContact);
 
 		ImageList_DrawEx(hCListImages, iIcon, hDC, rc->left, (rc->bottom + rc->top - g_cysmIcon) / 2, g_cxsmIcon, g_cysmIcon, CLR_NONE, CLR_NONE, ILD_NORMAL);
 		rc->left += 18;
@@ -216,7 +216,7 @@ void PaintNotifyArea(HDC hDC, RECT *rc)
 
 		NotifyMenuItemExData *nmi = (struct NotifyMenuItemExData *) mii.dwItemData;
 		wchar_t *szName = pcli->pfnGetContactDisplayName(nmi->hContact, 0);
-		int iIcon = pcli->pfnGetContactIcon(nmi->hContact);
+		int iIcon = Clist_GetContactIcon(nmi->hContact);
 		ImageList_DrawEx(hCListImages, iIcon, hDC, rc->left, (rc->bottom + rc->top - g_cysmIcon) / 2, g_cxsmIcon, g_cysmIcon, CLR_NONE, CLR_NONE, ILD_NORMAL);
 		rc->left += 18;
 		ImageList_DrawEx(hCListImages, nmi->iIcon, hDC, 4, (rc->bottom + rc->top) / 2 - 8, 16, 16, CLR_NONE, CLR_NONE, ILD_NORMAL);
diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index d9856cec30..4f3cfee501 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -118,7 +118,7 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 				if (GetMenuItemInfoA(cfg::dat.hMenuNotify, (UINT)dis->itemID, FALSE, &mii) != 0) {
 					nmi = (struct NotifyMenuItemExData *) mii.dwItemData;
 					if (nmi) {
-						iIcon = pcli->pfnGetContactIcon(nmi->hContact);
+						iIcon = Clist_GetContactIcon(nmi->hContact);
 						hIcon = ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL);
 						pcli->pfnDrawMenuItem(dis, hIcon, nmi->hIcon);
 						return TRUE;
-- 
cgit v1.2.3