CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

5 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 9f87d88961..ca0c6c673c 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -404,7 +404,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	case INTM_NAMECHANGED:

 		if (!Clist_FindItem(hwnd, dat, wParam, &contact, nullptr, nullptr))

 			break;

-		mir_wstrncpy(contact->szText, pcli->pfnGetContactDisplayName(wParam, 0), _countof(contact->szText));

+		mir_wstrncpy(contact->szText, Clist_GetContactDisplayName(wParam), _countof(contact->szText));

 

 		RTL_DetectAndSet(contact, 0);

 

@@ -490,7 +490,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 

 		contact->proto = GetContactProto(wParam);

 		pcli->pfnInvalidateDisplayNameCacheEntry(wParam);

-		mir_wstrncpy(contact->szText, pcli->pfnGetContactDisplayName(wParam, 0), _countof(contact->szText));

+		mir_wstrncpy(contact->szText, Clist_GetContactDisplayName(wParam), _countof(contact->szText));

 

 		RTL_DetectAndSet(contact, 0);

 

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 5a8ff6e979..82a98901a8 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -271,7 +271,7 @@ void RTL_DetectAndSet(ClcContact *contact, MCONTACT hContact)
 	memset(infoTypeC2, 0, sizeof(infoTypeC2));

 

 	if (contact == nullptr) {

-		szText = pcli->pfnGetContactDisplayName(hContact, 0);

+		szText = Clist_GetContactDisplayName(hContact);

 		p = cfg::getCache(hContact, nullptr);

 	}

 	else {

diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 88dbc9f368..b95a9d2a19 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -200,7 +200,7 @@ void PaintNotifyArea(HDC hDC, RECT *rc)
 	rc->left += 26;

 	int iCount = GetMenuItemCount(cfg::dat.hMenuNotify);

 	if (cfg::dat.hUpdateContact != 0) {

-		wchar_t *szName = pcli->pfnGetContactDisplayName(cfg::dat.hUpdateContact, 0);

+		wchar_t *szName = Clist_GetContactDisplayName(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);

@@ -215,7 +215,7 @@ void PaintNotifyArea(HDC hDC, RECT *rc)
 		GetMenuItemInfo(cfg::dat.hMenuNotify, iCount - 1, TRUE, &mii);

 

 		NotifyMenuItemExData *nmi = (struct NotifyMenuItemExData *) mii.dwItemData;

-		wchar_t *szName = pcli->pfnGetContactDisplayName(nmi->hContact, 0);

+		wchar_t *szName = Clist_GetContactDisplayName(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;

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 1e8ab1e3df..d697cb6728 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -253,7 +253,7 @@ CListEvent* AddEvent(CLISTEVENT *cle)
 		}

 

 		char *szProto = GetContactProto(p->hContact);

-		wchar_t *szName = pcli->pfnGetContactDisplayName(p->hContact, 0);

+		wchar_t *szName = Clist_GetContactDisplayName(p->hContact);

 		if (szProto && szName) {

 			NotifyMenuItemExData *nmi = (NotifyMenuItemExData*)malloc(sizeof(NotifyMenuItemExData));

 			if (nmi) {

diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp
index 2ac282d1a3..104594bea5 100644
--- a/plugins/Clist_nicer/src/clistmenus.cpp
+++ b/plugins/Clist_nicer/src/clistmenus.cpp
@@ -101,7 +101,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 					DWORD dwFlags = db_get_dw(hContact, "CList", "CLN_Flags", 0);

 					BYTE bSecondLine = db_get_b(hContact, "CList", "CLN_2ndline", -1);

 

-					mir_snwprintf(szTitle, TranslateT("Contact list display and ignore options for %s"), contact ? contact->szText : pcli->pfnGetContactDisplayName(hContact, 0));

+					mir_snwprintf(szTitle, TranslateT("Contact list display and ignore options for %s"), contact ? contact->szText : Clist_GetContactDisplayName(hContact));

 

 					SetWindowText(hWnd, szTitle);

 					Window_SetSkinIcon_IcoLib(hWnd, SKINICON_OTHER_MIRANDA);