CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

13 files changed, 15 insertions, 15 deletions

diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index 333b857f17..23c2bde316 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -105,7 +105,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoNa
 		pd.lchIcon = LoadIconEx("window");

 

 	PROTOACCOUNT *pa = Proto_GetAccount(pszProtoName);

-	mir_snwprintf(pd.lptzContactName, L"%s - %s", (pa == nullptr) ? _A2T(pszProtoName) : pa->tszAccountName, pcli->pfnGetContactDisplayName(hContact, 0));

+	mir_snwprintf(pd.lptzContactName, L"%s - %s", (pa == nullptr) ? _A2T(pszProtoName) : pa->tszAccountName, Clist_GetContactDisplayName(hContact));

 	wcsncpy_s(pd.lptzText, TranslateW(szBuf), _TRUNCATE);

 	pd.iSeconds = g_Settings.iPopupTimeout;

 

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index 1dfc61b5bf..c7c020de8c 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -2438,7 +2438,7 @@ void ShowRoom(TContainerData *pContainer, SESSION_INFO *si)
 			if ((pContainer = CreateContainer(L"default", CNT_CREATEFLAG_CLONED, hContact)) == nullptr)
 				return;
 
-	wchar_t *contactName = pcli->pfnGetContactDisplayName(hContact, 0);
+	wchar_t *contactName = Clist_GetContactDisplayName(hContact);
 
 	// cut nickname if larger than x chars...
 	wchar_t newcontactname[128];
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index 86e2066837..92ae6c0c39 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -111,7 +111,7 @@ bool CContactCache::updateNick()
 {
 	bool fChanged = false;
 	if (m_isValid) {
-		wchar_t *tszNick = pcli->pfnGetContactDisplayName(getActiveContact(), 0);
+		wchar_t *tszNick = Clist_GetContactDisplayName(getActiveContact());
 		if (tszNick && mir_wstrcmp(m_szNick, tszNick))
 			fChanged = true;
 		wcsncpy_s(m_szNick, (tszNick ? tszNick : L"<undef>"), _TRUNCATE);
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 58fc404227..92fc9fe9c6 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -613,7 +613,7 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, MCONTACT hContact, MEVENT hEve
 	pud.PluginData = pdata;

 

 	if (hContact)

-		wcsncpy_s(pud.lptzContactName, pcli->pfnGetContactDisplayName(hContact, 0), _TRUNCATE);

+		wcsncpy_s(pud.lptzContactName, Clist_GetContactDisplayName(hContact), _TRUNCATE);

 	else

 		wcsncpy_s(pud.lptzContactName, _A2T(dbe.szModule), _TRUNCATE);

 

@@ -720,7 +720,7 @@ int TSAPI UpdateTrayMenu(const CTabBaseDlg *dat, WORD wStatus, const char *szPro
 		SetMenuItemInfo(PluginConfig.g_hMenuTrayUnread, (UINT_PTR)hContact, FALSE, &mii);

 	}

 	else {

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

+		szNick = Clist_GetContactDisplayName(hContact);

 		if (CheckMenuItem(PluginConfig.g_hMenuTrayUnread, (UINT_PTR)hContact, MF_BYCOMMAND | MF_UNCHECKED) == -1) {

 			mir_snwprintf(szMenuEntry, L"%s: %s (%s) [%d]", tszFinalProto, szNick, szMyStatus, fromEvent ? 1 : 0);

 			AppendMenu(PluginConfig.g_hMenuTrayUnread, MF_BYCOMMAND | MF_STRING, (UINT_PTR)hContact, szMenuEntry);

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 7855a24064..a2e9c5d0c7 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -528,7 +528,7 @@ void CGlobals::RestoreUnreadMessageAlerts(void)
 	cle.szTooltip.w = toolTip;

 

 	for (auto &e : arEvents) {

-		mir_snwprintf(toolTip, TranslateT("Message from %s"), pcli->pfnGetContactDisplayName(e->hContact, 0));

+		mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(e->hContact));

 		cle.hContact = e->hContact;

 		cle.hDbEvent = e->hEvent;

 		pcli->pfnAddEvent(&cle);

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index f703b02e2c..7bcb6a345e 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -271,7 +271,7 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode)
 
 	if (mode) {
 		wchar_t szTip[256];
-		mir_snwprintf(szTip, TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName(hContact, 0));
+		mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));
 		if (fShowOnClist && M.GetByte(SRMSGMOD, "ShowTypingBalloon", 0))
 			Clist_TrayNotifyW(nullptr, TranslateT("Typing notification"), szTip, NIIF_INFO, 1000 * 4);
 
@@ -515,7 +515,7 @@ nowindowcreate:
 			cle.flags = CLEF_UNICODE;
 			cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
 			cle.pszService = MS_MSG_READMESSAGE;
-			contactName = pcli->pfnGetContactDisplayName(hContact, 0);
+			contactName = Clist_GetContactDisplayName(hContact);
 			mir_snwprintf(toolTip, TranslateT("Message from %s"), contactName);
 			cle.szTooltip.w = toolTip;
 			pcli->pfnAddEvent(&cle);
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index ceff02c1b5..af0aee1ff3 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -1224,7 +1224,7 @@ void CTabBaseDlg::StreamInEvents(MEVENT hDbEventFirst, int count, int fAppend, D
 			}

 			else {

 				evData.dwFlags = IEEDF_UNICODE_NICK;

-				evData.ptszNick = pcli->pfnGetContactDisplayName(m_hContact, 0);

+				evData.ptszNick = Clist_GetContactDisplayName(m_hContact);

 			}

 			switch (dbei_s->eventType) {

 				case EVENTTYPE_STATUSCHANGE: evData.iType = IEED_EVENT_STATUSCHANGE; break;

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index bfa2da6059..efb25389cb 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -576,7 +576,7 @@ HWND TSAPI CreateNewTabForContact(TContainerData *pContainer, MCONTACT hContact,
 	char *szProto = GetContactProto(hContact);

 

 	// obtain various status information about the contact

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

+	wchar_t *contactName = Clist_GetContactDisplayName(hContact);

 

 	// cut nickname if larger than x chars...

 	wchar_t newcontactname[128], tabtitle[128];

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index eb80099210..37f642ca4e 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -116,7 +116,7 @@ CSendLaterJob::~CSendLaterJob()
 			 * show a popup notification, unless they are disabled

 			 */

 			if (PluginConfig.g_bPopupAvail && fShowPopup) {

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

+				wchar_t	*tszName = Clist_GetContactDisplayName(hContact);

 

 				POPUPDATAT ppd = { 0 };

 				ppd.lchContact = hContact;

diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp
index 441596fb82..432dffe6a2 100644
--- a/plugins/TabSRMM/src/srmm.cpp
+++ b/plugins/TabSRMM/src/srmm.cpp
@@ -150,7 +150,7 @@ int _DebugPopup(MCONTACT hContact, const wchar_t *fmt, ...)
 
 	wchar_t	szTitle[128];
 	mir_snwprintf(szTitle, TranslateT("TabSRMM message (%s)"),
-		(hContact != 0) ? pcli->pfnGetContactDisplayName(hContact, 0) : TranslateT("Global"));
+		(hContact != 0) ? Clist_GetContactDisplayName(hContact) : TranslateT("Global"));
 
 	Clist_TrayNotifyW(nullptr, szTitle, debug, NIIF_INFO, 1000 * 4);
 	return 0;
diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 7128879516..b649dfc931 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -191,7 +191,7 @@ void TSAPI AddContactToFavorites(MCONTACT hContact, const wchar_t *szNickname, c
 	wchar_t szFinalNick[100];

 

 	if (szNickname == nullptr)

-		wcsncpy_s(szFinalNick, pcli->pfnGetContactDisplayName(hContact, 0), _TRUNCATE);

+		wcsncpy_s(szFinalNick, Clist_GetContactDisplayName(hContact), _TRUNCATE);

 	else

 		wcsncpy_s(szFinalNick, szNickname, _TRUNCATE);

 

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 1f5d6f7d8a..1eb3ad1e03 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -88,7 +88,7 @@ void TN_TypingMessage(MCONTACT hContact, int iMode)
 	if (!PluginConfig.g_bPopupAvail || Disabled)

 		return;

 

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

+	wchar_t *szContactName = Clist_GetContactDisplayName(hContact);

 

 	if (OnePopup) {

 		HWND hPopupWnd = WindowList_Find(hPopupsList, hContact);

diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index 8e62b2fd1b..91ec16cc14 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -415,7 +415,7 @@ INT_PTR CALLBACK DlgProcUserPrefsFrame(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			GetClientRect(hwndDlg, &rcClient);

 

 			wchar_t szBuffer[180];

-			mir_snwprintf(szBuffer, TranslateT("Set messaging options for %s"), pcli->pfnGetContactDisplayName(hContact, 0));

+			mir_snwprintf(szBuffer, TranslateT("Set messaging options for %s"), Clist_GetContactDisplayName(hContact));

 			SetWindowText(hwndDlg, szBuffer);

 

 			memset(&tci, 0, sizeof(tci));