CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

3 files changed, 5 insertions, 5 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 94ad21a6da..42852de473 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -819,7 +819,7 @@ retry:
 						gce.ptszUID = id;

 						wchar_t* messageT = mir_utf8decodeW(e->event.msg.message);

 						gce.ptszText = messageT;

-						gce.ptszNick = (wchar_t*)pcli->pfnGetContactDisplayName(getcontact(e->event.msg.sender, 1, 0, nullptr), 0);

+						gce.ptszNick = (wchar_t*)Clist_GetContactDisplayName(getcontact(e->event.msg.sender, 1, 0, nullptr));

 						gce.time = (!(e->event.msg.msgclass & GG_CLASS_OFFLINE) || e->event.msg.time > (t - timeDeviation)) ? t : e->event.msg.time;

 						gce.dwFlags = GCEF_ADDTOLOG;

 						debugLogW(L"mainthread() (%x): Conference message to room %s & id %s.", this, chat, id);

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index 7cde32feef..f1d5e11aec 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -282,7 +282,7 @@ wchar_t* GaduProto::gc_getchat(uin_t sender, uin_t *recipients, int recipients_c
 					unknown >= getWord(GG_KEY_GC_COUNT_UNKNOWN, GG_KEYDEF_GC_COUNT_UNKNOWN))))

 		{

 			wchar_t *senderName = unknownSender ?

-				TranslateT("Unknown") : pcli->pfnGetContactDisplayName(getcontact(sender, 0, 0, nullptr), 0);

+				TranslateT("Unknown") : Clist_GetContactDisplayName(getcontact(sender, 0, 0, nullptr));

 			wchar_t error[256];

 			mir_snwprintf(error, TranslateT("%s has initiated conference with %d participants (%d unknowns).\nDo you want to participate?"),

 				senderName, recipients_count + 1, unknown);

@@ -309,7 +309,7 @@ wchar_t* GaduProto::gc_getchat(uin_t sender, uin_t *recipients, int recipients_c
 	wchar_t *senderName;

 	if (sender)

 	{

-		senderName = pcli->pfnGetContactDisplayName(getcontact(sender, 1, 0, nullptr), 0);

+		senderName = Clist_GetContactDisplayName(getcontact(sender, 1, 0, nullptr));

 		mir_snwprintf(status, TranslateT("%s initiated the conference."), senderName);

 	}

 	else

@@ -365,7 +365,7 @@ wchar_t* GaduProto::gc_getchat(uin_t sender, uin_t *recipients, int recipients_c
 		MCONTACT hContact = getcontact(chat->recipients[i], 1, 0, nullptr);

 		UIN2IDT(chat->recipients[i], id);

 		if (hContact)

-			gce.ptszNick = pcli->pfnGetContactDisplayName(hContact, 0);

+			gce.ptszNick = Clist_GetContactDisplayName(hContact);

 		else

 			gce.ptszNick = TranslateT("'Unknown'");

 		gce.bIsMe = 0;

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index 38540c4620..844d3a4c28 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -423,7 +423,7 @@ static INT_PTR CALLBACK gg_img_dlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		// Set main window image

 		Window_SetIcon_IcoLib(hwndDlg, GetIconHandle(IDI_IMAGE));

 

-		wchar_t *szName = pcli->pfnGetContactDisplayName(dat->hContact, 0), szTitle[128];

+		wchar_t *szName = Clist_GetContactDisplayName(dat->hContact), szTitle[128];

 		if (dat->bReceiving)

 			mir_snwprintf(szTitle, TranslateT("Image from %s"), szName);

 		else