CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

4 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 428faca9e7..7be75f489f 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -474,7 +474,7 @@ void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact)
 		return;
 
 	ClcCacheEntry *pdnce = contact->pce;
-	wchar_t *name = pcli->pfnGetContactDisplayName(contact->hContact, 0);
+	wchar_t *name = Clist_GetContactDisplayName(contact->hContact);
 	if (dat->first_line_append_nick && !dat->bForceInDialog) {
 		DBVARIANT dbv = { 0 };
 		if (!db_get_ws(pdnce->hContact, pdnce->szProto, "Nick", &dbv)) {
diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index 00a773967a..063a41c14b 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -283,7 +283,7 @@ void cliBeginRenameSelection(HWND hwnd, ClcData *dat)
 	if (contact->type == CLCIT_GROUP)

 		dat->hwndRenameEdit = CreateWindow(L"EDIT", contact->szText, WS_POPUP | WS_BORDER | ES_AUTOHSCROLL | a, x, y, w, h, hwnd, nullptr, g_hInst, nullptr);

 	else

-		dat->hwndRenameEdit = CreateWindow(L"EDIT", pcli->pfnGetContactDisplayName(contact->hContact, 0), WS_POPUP | WS_BORDER | ES_AUTOHSCROLL | a, x, y, w, h, hwnd, nullptr, g_hInst, nullptr);

+		dat->hwndRenameEdit = CreateWindow(L"EDIT", Clist_GetContactDisplayName(contact->hContact), WS_POPUP | WS_BORDER | ES_AUTOHSCROLL | a, x, y, w, h, hwnd, nullptr, g_hInst, nullptr);

 

 	SetWindowLongPtr(dat->hwndRenameEdit, GWL_STYLE, GetWindowLongPtr(dat->hwndRenameEdit, GWL_STYLE)&(~WS_CAPTION) | WS_BORDER);

 	SetWindowLongPtr(dat->hwndRenameEdit, GWLP_USERDATA, (LONG_PTR)dat);

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 0278b00bbb..290b7fbf04 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -109,7 +109,7 @@ CListEvent* cli_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 = (struct NotifyMenuItemExData *) malloc(sizeof(struct NotifyMenuItemExData));

 			if (nmi) {

@@ -287,7 +287,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC)
 	int iCount = GetMenuItemCount(g_CluiData.hMenuNotify);

 	rc.left += 26;

 	if (g_CluiData.hUpdateContact != 0) {

-		wchar_t *szName = pcli->pfnGetContactDisplayName(g_CluiData.hUpdateContact, 0);

+		wchar_t *szName = Clist_GetContactDisplayName(g_CluiData.hUpdateContact);

 		int iIcon = Clist_GetContactIcon(g_CluiData.hUpdateContact);

 

 		ske_ImageList_DrawEx(g_himlCListClc, iIcon, hDC, rc.left, (rc.bottom + rc.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL);

@@ -302,7 +302,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC)
 		GetMenuItemInfo(g_CluiData.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);

 		ske_ImageList_DrawEx(g_himlCListClc, iIcon, hDC, rc.left, (rc.bottom + rc.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL);

 		rc.left += 18;

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index 0349d110f8..1dbfe85f35 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -43,7 +43,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce)
 

 	if (pdnce->hContact == 0) { //selfcontact

 		if (!pdnce->tszName)

-			pdnce->tszName = pcli->pfnGetContactDisplayName(0, GCDNF_NOCACHE);

+			pdnce->tszName = Clist_GetContactDisplayName(0, GCDNF_NOCACHE);

 		return;

 	}

 

@@ -54,7 +54,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce)
 	}

 

 	if (pdnce->tszName == nullptr) {

-		pdnce->tszName = pcli->pfnGetContactDisplayName(pdnce->hContact, GCDNF_NOCACHE);

+		pdnce->tszName = Clist_GetContactDisplayName(pdnce->hContact, GCDNF_NOCACHE);

 		pdnce->m_bIsUnknown = !mir_wstrcmp(pdnce->tszName, UnknownConctactTranslatedName);

 	}