CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

3 files changed, 9 insertions, 9 deletions

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 39faa19528..edf5edcdb2 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -211,7 +211,7 @@ wchar_t* GetStr(STATUSMSGINFO *n, const wchar_t *tmplt)
 				if (n->hContact == NULL)

 					res.Append(TranslateT("Contact"));

 				else

-					res.Append(pcli->pfnGetContactDisplayName(n->hContact, 0));

+					res.Append(Clist_GetContactDisplayName(n->hContact));

 				break;

 

 			case 's':

@@ -438,7 +438,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 	if (opt.BlinkIcon && !opt.TempDisabled) {

 		HICON hIcon = opt.BlinkIcon_Status ? Skin_LoadProtoIcon(szProto, newStatus) : Skin_LoadIcon(SKINICON_OTHER_USERONLINE);

 		wchar_t str[256];

-		mir_snwprintf(str, TranslateT("%s is now %s"), pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText);

+		mir_snwprintf(str, TranslateT("%s is now %s"), Clist_GetContactDisplayName(hContact), StatusList[Index(newStatus)].lpzStandardText);

 		BlinkIcon(hContact, hIcon, str);

 	}

 

@@ -455,7 +455,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 		GetTimeFormat(LOCALE_USER_DEFAULT, 0, nullptr, L"HH':'mm", stzTime, _countof(stzTime));

 		GetDateFormat(LOCALE_USER_DEFAULT, 0, nullptr, L"dd/MM/yyyy", stzDate, _countof(stzDate));

 		mir_snwprintf(stzText, TranslateT("%s, %s. %s changed status to %s (was %s)\r\n"),

-			stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText,

+			stzDate, stzTime, Clist_GetContactDisplayName(hContact), StatusList[Index(newStatus)].lpzStandardText,

 			StatusList[Index(oldStatus)].lpzStandardText);

 		LogToFile(stzText);

 	}

@@ -728,7 +728,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 	if (opt.BlinkIcon && opt.BlinkIcon_ForMsgs && !opt.TempDisabled) {

 		HICON hIcon = opt.BlinkIcon_Status ? Skin_LoadProtoIcon(szProto, db_get_w(hContact, szProto, "Status", ID_STATUS_ONLINE)) : Skin_LoadIcon(SKINICON_OTHER_USERONLINE);

 		wchar_t str[256];

-		mir_snwprintf(str, TranslateT("%s changed status message to %s"), pcli->pfnGetContactDisplayName(hContact, 0), smi.newstatusmsg);

+		mir_snwprintf(str, TranslateT("%s changed status message to %s"), Clist_GetContactDisplayName(hContact), smi.newstatusmsg);

 		BlinkIcon(hContact, hIcon, str);

 	}

 

@@ -755,7 +755,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		else

 			str = GetStr(&smi, templates.LogSMsgChanged);

 

-		mir_snwprintf(stzText, L"%s, %s. %s %s\r\n", stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), str);

+		mir_snwprintf(stzText, L"%s, %s. %s %s\r\n", stzDate, stzTime, Clist_GetContactDisplayName(hContact), str);

 

 		LogToFile(stzText);

 		mir_free(str);

diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index c0765dddb9..a0062327b3 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -26,7 +26,7 @@ void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const wchar
 	POPUPDATAT ppd = { 0 };

 	ppd.lchContact = hContact;

 	ppd.lchIcon = hIcon;

-	CMStringW buf(pcli->pfnGetContactDisplayName(hContact, 0));

+	CMStringW buf(Clist_GetContactDisplayName(hContact));

 

 	// add group name to popup title

 	if (opt.ShowGroup) {

diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 0267704979..6bcc4a7b05 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -122,7 +122,7 @@ CMStringW ReplaceVars(XSTATUSCHANGE *xsc, const wchar_t *tmplt)
 				if (xsc->hContact == NULL)

 					res.Append(TranslateT("Contact"));

 				else

-					res.Append(pcli->pfnGetContactDisplayName(xsc->hContact, 0));

+					res.Append(Clist_GetContactDisplayName(xsc->hContact));

 				break;

 

 			default:

@@ -223,7 +223,7 @@ void BlinkXStatusIcon(XSTATUSCHANGE *xsc)
 	HICON hIcon = nullptr;

 	wchar_t str[256] = { 0 };

 	wchar_t stzType[32];

-	mir_snwprintf(str, TranslateT("%s changed %s"), pcli->pfnGetContactDisplayName(xsc->hContact, 0), GetStatusTypeAsString(xsc->type, stzType));

+	mir_snwprintf(str, TranslateT("%s changed %s"), Clist_GetContactDisplayName(xsc->hContact), GetStatusTypeAsString(xsc->type, stzType));

 

 	if (opt.BlinkIcon_Status) {

 		DBVARIANT dbv;

@@ -334,7 +334,7 @@ void LogChangeToFile(XSTATUSCHANGE *xsc)
 	}

 

 	mir_snwprintf(stzText, L"%s, %s. %s %s\r\n", stzDate, stzTime, 

-		pcli->pfnGetContactDisplayName(xsc->hContact, 0), ReplaceVars(xsc, Template).GetString());

+		Clist_GetContactDisplayName(xsc->hContact), ReplaceVars(xsc, Template).GetString());

 

 	LogToFile(stzText);

 }